tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,925 Commits 3 Branches 5 Tags
e26e662023da11ea77c05e10ef46b77cee2041d0
Commit Graph

26925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mhamster
e26e662023 Small json files fixes (#30907) 
Small json fixes

Resources/Textures/Interface/Default/meta.json: trailing comma
Resources/Textures/Objects/Specific/Hydroponics/attribution.json: proper json
Resources/Textures/Tiles/Planet/Snow/meta.json: trailing commas
 2024-08-11 23:26:45 +10:00
Ubaser
58fd50c369 fix a capitalisation mistake (#30908) 
ad
 2024-08-11 22:51:19 +10:00
PJBot
6ec6a28aeb Automatic changelog update 2024-08-11 10:27:43 +00:00
Moomoobeef
28efd76e82 adds a throngler plushie, and adds it to the grand lotto (#29978) 
* adds a throngler plushie, and adds it to the grand lotto

* this was supposed to be in the initial commit but I apparently forgot to save so anyway here it is

* make throngler plushie more rare

how about I split the difference:
original throngler: 0.0001
other plushies: 0.01
thongler plushie: 0.0005

* removed inheritied soundhit
 2024-08-11 20:26:37 +10:00
Brandon Hu
31c5d3555e fix(Commands): Improve Localization of commands. Standardize some behaviors. (#30362) 
* I should be studying for school but that is sofucking boring, I will pass my class no matter, however getting an A might be a challenge. My gpa is important but is the tourture for 1 point of GPA worth it? The american government says yes but they are responsible for the majority of all genocides that have ever been conducted since the dawn of man

* ugh

* ugh
 2024-08-11 19:46:57 +10:00
PJBot
e0f292921f Automatic changelog update 2024-08-11 09:24:20 +00:00
slarticodefast
bd5d415575 Make the sentient plant mutation non-copyable to other plantholders (#29133) 
make the sentient plant mutation not propagate by clipping, using the seed extractor or cryoxadone
 2024-08-11 19:23:14 +10:00
osjarw
456410239e Reorder priorities in MeleeCombatCompound (#30066) 
Reordered MeleeCombatCompound to improve unpulling
 2024-08-11 19:22:46 +10:00
PJBot
8c4e5c5848 Automatic changelog update 2024-08-11 09:20:06 +00:00
Token
ad71d8cb2f Pax now refresh instead of stacking pacified forever (#30778) 
Pax refreshes instead of stacking pacified forever
 2024-08-11 19:19:00 +10:00
Plykiya
b6d04f884c EntityTables for sec belts and webbing (#30900) 
* EntityTables for sec belts and webbing

* update name

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-08-11 19:16:46 +10:00
PJBot
93c9d49f9b Automatic changelog update 2024-08-11 09:16:34 +00:00
lzk
f93fe05f4c Make RCD ui activateable only in hand (#30861) 2024-08-11 19:15:28 +10:00
blueDev2
b16e57ee94 Add MinHealth Construction Condition (#30892) 
* Add Min Health Condition and associated Locale

* Add Comment
 2024-08-11 19:14:35 +10:00
PJBot
aabaaf1fec Automatic changelog update 2024-08-11 09:05:48 +00:00
BombasterDS
67253a3fe1 Change suit sensors on other players (#29668) 
* Suit sensors can be turned off on other players

* less doafter time + interaction (nostate) check

* code cleanup

* code cleanup 2
 2024-08-11 19:04:42 +10:00
PJBot
c8f1c22ff2 Automatic changelog update 2024-08-11 06:22:41 +00:00
Plykiya
6aed90ed75 Rename cooking shelf, improve content whitelist (#30858) 
Rename cooking shelf to kitchen shelf

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-08-11 16:21:34 +10:00
Mervill
d7b5ae061a Don't show Station Event announcements to players in the lobby. (#30886) 
* Don't show Station Event announcements to players in the lobby.

* fix pr

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-08-11 16:09:33 +10:00
Plykiya
8d72e7d932 Make head of department lockers use EntityTables (#30854) 
* EntityTables for head of department lockers

* I hope this works

* even smaller

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-08-11 13:12:26 +10:00
PJBot
0dc2d0acd0 Automatic changelog update 2024-08-11 03:07:02 +00:00
beck-thompson
ee922e37f6 Replaced some AddMarkups with AddMarkupOrThrow (#30632) 
* First commit

* Silly me

* bruh
 2024-08-11 13:06:33 +10:00
Scribbles0
220aff21eb Melee Executions (#30104) 
* melee executions

* fix damage bug

* cleanup

* address reviews hopefully

* resistance bypass mechanic

* component changes

* self executions (not finished yet)

* self execs part two

* ok i fixed things (still not finished)

* finish everything

* review stuff

* nuke if (kind = special)

* more review stuffs

* Make suicide system much less hardcoded and make much more use of events

* Fix a dumb bug I introduced

* self execution popups

* Integration tests

* Why did they even take 0.5 blunt damage?

* More consistent integration tests

* Destructive equals true

* Allow it to dirty-dispose

* IS THIS WHAT YOU WANT?

* FRESH AND CLEAN

* modifier to multiplier

* don't jinx the integration tests

* no file-scoped namespace

* Move the rest of execution to shared, create SuicideGhostEvent

* handled

* Get rid of unused code and add a comment

* ghost before suicide

* stop cat suicides

* popup fix + small suicide change

* make it a bit better

---------

Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
 2024-08-11 13:05:54 +10:00
Mervill
c25c5ec666 Remove uses of Component.Owner from AmbientSoundSystem (#30842) 
Remove Component.Owner from AmbientSoundSystem
 2024-08-11 12:39:37 +10:00
ShadowCommander
2f77d0d4f3 Add a component that inserts the held item when no interaction happens on the stored item (#29823) 
* Insert when held item has no interaction with stored item

* Decouple inserting on failure

* Add component that stores the used entity when no interaction happened

* Add prediction
 2024-08-11 12:29:44 +10:00
metalgearsloth
d7c3ba8409 Add some container checks (#30896) 
Climbable container probably getting checked up the callstack so just check these ones.
 2024-08-11 12:28:07 +10:00
metalgearsloth
9be61bfaa5 Make followed session-specific (#30770) 
* Make followed session-specific

* misimport
 2024-08-11 12:26:32 +10:00
github-actions[bot]
84217011a9 Update Credits (#30891) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2024-08-11 11:45:49 +10:00
Mervill
32e315c68f Refactor LightBehaviorSystem to remove obsolete code (#30890) 2024-08-11 11:45:37 +10:00
beck-thompson
09c8d4abd4 Torch no longer gives errors (#30884) 
First commit
 2024-08-10 20:05:35 -04:00
PJBot
f76fa0e5ae Automatic changelog update 2024-08-10 21:07:57 +00:00
Flareguy
179534f18d Vox Minor Clothing Update 2: Electric Boogaloo (#30838) 
* more vox masks n stuff

* cluwne

* fix

* merc gas mask

* bunny tail height fix
 2024-08-11 00:06:50 +03:00
PJBot
a99900fcd8 Automatic changelog update 2024-08-10 19:51:16 +00:00
Brandon Hu
63967bec88 tweak(Shuttle_honki): Replace clown spiders with honkbots (#30617) 2024-08-10 13:51:00 -06:00
Preston Smith
81371b90d1 Updated Core boxing ring beacon (#30800) 
Updated boxing ring beacon to be correctly labeled
 2024-08-10 13:50:08 -06:00
Brandon Hu
76d60140f6 add(meta): Add missing airvent to airlock (#30871) 2024-08-10 13:49:01 -06:00
Brandon Hu
d524d61b22 tweak(oasis): Lower the engineering borg spawn (#30874) 2024-08-10 13:48:47 -06:00
Brandon Hu
8afec58a0c chore(atlas): Remove EntityStorageComponent (#30876) 2024-08-10 13:48:19 -06:00
Brandon Hu
95034512c1 chore(marathon): Remove EntityStorageComponent (#30877) 2024-08-10 13:48:10 -06:00
Brandon Hu
6b5eb93fe7 chore(omega): Remove EntityStorageComponent (#30879) 2024-08-10 13:47:52 -06:00
Brandon Hu
6803021623 chore(meta): Remove EntityStorageComponent (#30883) 2024-08-10 13:47:41 -06:00
Brandon Hu
e569a78f17 chore(bagel): Remove EntityStorageComponent (#30881) 2024-08-10 13:47:28 -06:00
PJBot
cfd8ef49d9 Automatic changelog update 2024-08-10 19:32:38 +00:00
Ed
4d75cb54c8 Custom burgers - FoodSequence system (#30755) 
* setup foodsequence

* name generation and max layers limit

* move to nutrition

* move code to serverside

* move to appearance data

* marked fields as required

* Update foodsequence.yml

* b

* burgeers!

* Update produce.yml

* Update meat.yml

* Update burger.yml

* fix duplicate naming

* Update Resources/Locale/en-US/nutrition/components/food-sequence.ftl

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>

* merge flavor profiles

* make food trash List<>

* merge trash

* Update FoodComponent.cs

* Update FoodComponent.cs

* organs and cannabis support

---------

Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com>
 2024-08-10 22:31:32 +03:00
Brandon Hu
707daa1a5e tweak(snowy_labs): Remove non-valid holoparasite (#30875) 2024-08-10 21:53:56 +03:00
Kukutis96513
b6e10a0b7b Reach tweaks reattempt 2 (#30782) 
* uhhh fix stuff maybe

* - added a fax machine
- made botany slightly bigger to accommodate a nutrimax vending machine
- added air alarms, scrubbers and a waste pipe network
 2024-08-10 12:25:12 -06:00
PJBot
084812cb44 Automatic changelog update 2024-08-10 18:18:03 +00:00
lzk
9ba038d04f Standartize clothing recipes (#29315) 2024-08-11 04:16:56 +10:00
MerrytheManokit
249d3cd74d Remove meta voiceline from the passenger figure (#30868) 
Update figurines.ftl
 2024-08-11 02:37:33 +10:00
deathride58
7e44e75d74 #30851 followup - murderficates links (#30863) 
kneecaps links while we're at it
 2024-08-11 02:15:05 +10:00