juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,500 Commits 57 Branches 0 Tags
7aa0bade6cac1ad8d3b200cec398ebf7cd984e72
Commit Graph

7079 Commits

Author SHA1 Message Date
Plykiya
e3b061025d Fix: Dragging items over atmos pipes is slow. (#25629) 
* Change tilefrictionmodifier of default item to base friction

* Remove anchored friction modifier from baseItem

* Revert "Remove anchored friction modifier from baseItem"

This reverts commit 2d9d53f38a3704c8b5df4172629c78812f72f6ae.

* Removed anchored friction component from BaseItem.

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
 2024-02-29 16:41:56 -05:00
potato1234_x
e2741498b8 Add fill levels to bowls (#25639) 
* fills

* contrast
 2024-02-29 16:41:14 -05:00
Flareguy
b0e811b4f3 Removes all big O2 tanks from non-emergency & fire lockers + removes counterpart N2 tanks (#25660) 
kills off N2 & O2 tanks from lockers & removes duplicate n2 tanks from stuff with o2 tanks
 2024-02-29 16:40:17 -05:00
Aexxie
e4d98f1ab9 survival nutribricks, lizzers can eat nutribricks, moffs can eat the leftovers (#25659) 
* I forgot to commit, damn it

* Adds the brick to survival kit
 2024-02-29 16:39:52 -05:00
LordCarve
8c6c19c993 Fix PDA home icon (#25721) 
Fix PDA home icon.
 2024-02-29 20:22:12 +01:00
Kukutis96513
e17acdc6b0 Buff Bulk Lizard Plushie Crate (#25122) 
* number stuff

* too many wehs, must increase price..

* Update fun.yml

* Update cargo_fun.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-02-29 19:45:04 +03:00
lzk
4bb5b23145 Fix typo (#25712) 2024-02-29 15:56:27 +03:00
Rainfey
4e6c59cfe5 Refactor antag rule code (#23445) 
* Initial Pass, Rev, Thief

* Zombie initial pass

* Rebase, Traitor

* Nukeops, More overloads

* Revert RevolutionaryRuleComponent

* Use TryRoundStartAttempt, Rewrite nukie spawning

* Comments, Add task scheduler to GameRuleSystem

* Zombie initial testing done

* Sort methods, rework GameRuleTask

* Add CCVar, Initial testing continues

* Might as well get rid of the obsolete logging

* Oops, i dont know how to log apparently

* Suggested formatting fixes

* Suggested changes

* Fix merge issues

* Minor optimisation

* Allowed thief to choose other antags

* Review changes

* Spawn items on floor first, then inserting

* minor tweaks

* Shift as much as possible to ProtoId<>

* Remove unneeded

* Add exclusive antag attribute

* Fix merge issues

* Minor formatting fix

* Convert to struct

* Cleanup

* Review cleanup (need to test a lot)

* Some fixes, (mostly) tested

* oop

* Pass tests (for real)

---------

Co-authored-by: Rainfall <rainfey0+git@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
 2024-02-29 17:25:10 +11:00
Ubaser
ad7256750c Remove Eris UI theme (#25673) 
add
 2024-02-28 23:53:48 -06:00
Nairod
4446fd2d5d Weld To Remove Rust On Reinforced Walls (#25690) 2024-02-29 11:44:01 +11:00
lzk
ec28e777c1 Remake cargo orders to contains flatpacks (#25647) 
* Remake cargo orders to contains flatpacks

* whoop

* grounging plamsa
 2024-02-28 17:02:02 -05:00
metalgearsloth
5425742617 Add anchorable flags (#25667) 
Added it to cargo pallet and the ATS puter. Small steps. Also moved the log until the anchoring is actually confirmed to prevent dummy logs.
 2024-02-28 17:00:12 -05:00
Cojoke
dddec4dcc6 Makes the e-sword light plasma fires, as intended. (#25665) 
* Makes the e-sword light plasma fires, as intended.

* remove blank line
 2024-02-28 16:59:35 -05:00
Whisper
b720871d0b Fix iron/copper being overtuned (infinite blood exploit!) (#25678) 
* Fix iron being overtuned due to oversight

* fix copper too
 2024-02-28 16:56:22 -05:00
potato1234_x
013d125ee4 change laughin pea values (#25672) 
rebalance
 2024-02-28 16:54:27 -05:00
Firewatch
93d820f315 Syndicate Decoy Bundle + Snap Pops (#25333) 
* it works

halilujeah

* toggleable lights

removes a redundant flashlight since you can turn on the balloons to cast light

* final touches

syndicate decoys :trollface:

* touches

it works now

* minor spelling mistake

⭐

* minor spelling mistake 2

darn

* adds whistle

commanders now spawn with a whistle around their neck

* yaml linter

luv you linter baby

* smallify the whistle

it was way too big, this has been addressed

* sprite fix

am dummy 👍

* netsync errors

wouldn't compile properly

* forgor

* i suck at yaml

smh

* decoys for all

now both syndicate and traitors can use the decoys, yippee!

* Update meta.json

credit my discord username

* Update uplink-catalog.ftl

* Update decoys.yml

base decoy no longer shows in the entity browser

* immortal gone

balloons have gained mortality
 2024-02-28 16:53:46 -05:00
Menshin
9884351101 Add space heaters (#25250) 2024-02-28 10:27:29 -08:00
YuNii
1c015d1fd5 Fix typos calling salvage specialists a 'salvage technician' (#25657) 
fix typos calling salvage specialists a 'salvage technician
 2024-02-27 21:59:21 +01:00
Velcroboy
963c9f6fbc Remove obsolete suffix (#25649) 
Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2024-02-27 15:15:35 -05:00
rosieposie
e94d190ade Stalagmite Changes (#25646) 
* initial commit

* remove unnecessary thing

* Revert "remove unnecessary thing"

This reverts commit c4e3aecbcb9088c4dee5bf41dc5cc88eaa81f505.

* fix (real)
 2024-02-27 22:24:17 +03:00
rosieposie
8dd1748cec Lockable Buttons & Button Frames (#25631) 
initial commit
 2024-02-27 00:57:17 -07:00
Julian Giebel
0752acdc2c News UI overhaul and PDA notifications (#19610) 2024-02-26 21:38:00 -04:00
Zadeon
133bd0353a Adds minable salt "ore" (#25324) 
* Added salt to ore.yml
Added salt to ores.yml
Added salt walls to asteroid.yml
Added salt to BaseAsteroidDebris' list of ores to generate in asteroids.yml
Added OreSalt to biome_ore_templates.yml
Added salt to guaranteed salvageLoot in salvage_loot.yml
Added salt entry under salvage-magnet-resources in salvage-magnet.ftl
Added WIP sprites for salt.

* Renamed salt's id to SaltOre inside Entities/Objects/Materials/ore.yml
Fixed salt not being grindable due to using an incorrect reagent name
Added salt to ore.rsi/meta.json and rock.rsi/meta.json

* Added chlorine to the list of solutions salt gives when used in the grinder.

* Gave salt ore and salt rock overlay unique sprites.

* Added raw salt to materials/materials.ftl
Updated SaltOre definition in ore.yml to have RawSalt under materialComposition

* Updated saltore definition to give 10 units of tablesalt and 5 units of iodine when ground.
 2024-02-26 16:34:15 -07:00
Velcroboy
32a440b487 Adjusts wallmount arcs and partially fix nanomed issues (#25451) 
* Adjusts wallmount arcs and partially fix nanomed issues

* wall closets

* Guess it wants this

* Adjust arc to 175

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2024-02-26 16:28:55 -07:00
Whisper
ff65cb7b0c Whisper bleed update v3 (#25434) 
* Whisper bleed update v3

* missed a few

* Add bleeding message to health analyzer.

* Fix bleed notification not updating.

* Apparently this either doesnt exist
 2024-02-26 16:26:46 -07:00
Sphiral
88ae71715b More windoors (starring directional window) (#25501) 
* Added Plasma and Uranium Windoors, plus uranium directional windows

* I forgor the locked proto's too ;-;

* Skill issue, forgot to remove something that was a test

* Please dear git tests, let me sleep (ShardGlassRUranium indeed does not exist)

* No more static prices for windows/windoors

* I wish I knew how to run the tests locally ;-;
 2024-02-26 16:25:44 -07:00
Ed
7a5f81ddb4 Handheld Mass Scanner (#25526) 
* handheld

* Update meta.json

* Update meta.json

* Update cargo.yml

* research

* add to borg

* bruh

* borg to T2

* fix
 2024-02-26 16:19:51 -07:00
MACMAN2003
0536ce6f95 add NanoTrasen balloon (#25543) 
nt balloon

surprised one didn't exist already
 2024-02-26 16:15:53 -07:00
SlamBamActionman
3af2928a25 Add nose customization to humans & dwarves (#25557) 
Initial commit
 2024-02-26 16:15:04 -07:00
Ed
84cbcb93ca Fancy table (#25562) 
* blue

* others

* add white table

* add crafting carpets

* finish carpets

* tags

* crafting

* pip

* finish
 2024-02-26 16:11:20 -07:00
GNF54
b7b6f61f2a Added several cosmetic items to the Medidrobe (#25582) 
Update medidrobe.yml
 2024-02-26 16:07:06 -07:00
PoorMansDreams
25deede839 Behonker Lobby Art (#25455) 
* Behonker Lobby

* Change to WebP

* More PostProcessing!
 2024-02-26 16:06:08 -07:00
Whisper
74232f9831 handcuff replacements are faster to escape from (#25601) 
makeshift handcuffs are easier to escape from
 2024-02-26 16:05:16 -07:00
Ilya246
849dc43365 macrobomb 20->13 TC (#25585) 
Update uplink_catalog.yml
 2024-02-26 16:04:26 -07:00
Brandon Hu
5367d99545 fix(cooktime): mushroom pizza are set to the proper cook time of 30 seconds (#25614) 2024-02-26 16:01:21 -07:00
Hanz
6b00f592b6 ERT PDA Fixup (#25606) 
meat and potatoes

ayup
 2024-02-26 16:00:51 -07:00
CyberDuck
c0290d18f2 Buff/Nerf Gases Cost (#25608) 
* Nerf/Buff Gases cost

* Nerf/Buff Gases cost

* Nerf/Buff Gases cost

---------

Co-authored-by: CyberDuck <tsyaslovscky.dima@yandex.by>
 2024-02-26 16:00:13 -07:00
Whisper
30e09af2a4 Add weh to: Anomalies, Artifacts, random puddles (#25611) 
* Add weh to: Anomalies, Artifacts, random puddles

* also change weh to wehs!
 2024-02-26 15:59:15 -07:00
MACMAN2003
89c8226380 Lathe-able LED light tubes and LED bulbs (#25616) 
let there be (led) light
 2024-02-26 15:58:01 -07:00
Velcroboy
19ce9edf10 Fix inconsistency in onions (#25619) 
Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2024-02-26 15:57:19 -07:00
Velcroboy
2efad4f3c5 Cleans up base crates for mapping clarity (#25618) 
* Cleans up base crates for mapping clarity

* migration

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2024-02-26 15:56:41 -07:00
Boaz1111
76823cc522 swapped icons for RCD crates (#25600) 
swapped icons for crates
 2024-02-26 07:37:49 -05:00
deltanedas
002b8d8871 add crew monitor as traitor steal objective (#25563) 2024-02-25 22:40:48 -05:00
SlamBamActionman
485fb4cb65 Remove self-uncuff spam suicide, damage changes (#25161) 
* Initial commit

* Remove damage from cuffs entirely

* Changed from Action uncuffing cooldown to UseDelay cooldown

* Minor merge conflict fix

* Edit the actual correct line

* Submodule fix
 2024-02-26 13:41:20 +11:00
OctoRocket
b7be6932f3 [Tweak] Everything can read (#25580) 
Everything can read (kinda)
 2024-02-26 13:40:22 +11:00
Ed
656679cb54 Flora anomaly nerf (#25499) 
* Update kudzu.yml

* Update living_light.yml

* files

* Update flora.yml

* Update kudzu.yml

* bul

* Update kudzu.yml

* Update living_light.yml

* bullet immune
 2024-02-25 15:41:24 -08:00
hiucko
97d41cf945 add "missing spacepen" poster (#25502) 
* add missing spacepen poster

adds missing spacepen poster

* Update meta.json

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-02-26 02:33:12 +03:00
wafehling
b30cda8b42 Added Survival to the secret rotation (#25568) 2024-02-25 13:15:35 -08:00
Whisper
1de102d08e Juice that makes you Weh! (but real!) (#25132) 
* Juice that makes you Weh!

* Remove dupe

* updated the localization files

* try to fix error
 2024-02-26 00:54:07 +11:00
Krunklehorn
902198d7e0 Fix candy bowls (#25514) 
* Before SharedItemSystem

* Fixes mispredict, removed unused

* Fix physics
 2024-02-26 00:08:14 +11:00