NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-18 06:31:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
35409 commits 14 branches 0 tags 2.9 GiB
Commit graph

35409 commits

This branch
This branch
All branches
Author SHA1 Message Date
Connor Huffine
a9b953cdfe
Add origin member to class (#41250) 
* Add origin member to class

* whitespace

* Add comments

Added some doc polish while I was here.

* Update comments

Clarification and accuracy

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2026-01-07 22:31:13 +00:00
PJBot
3633cdb537 Automatic changelog update 2026-01-07 22:20:48 +00:00
Connor Huffine
b267bad990
Ninja bomb planting tweak (#41208) 
* Anchorable to Animatable

* Change to whitelist

Windows and walls only

* Update guidebook.
 2026-01-07 22:05:39 +00:00
PJBot
95bdc66f10 Automatic changelog update 2026-01-07 22:04:34 +00:00
āda
8b9801a5bb
Reorganize and clean Fun yml (#42184) 
* don't look at this commit size i'm not proud

* self review

* more final changes

* more comments

* review

* review

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2026-01-07 21:49:24 +00:00
PJBot
8be191ab8c Automatic changelog update 2026-01-07 19:39:01 +00:00
SomegnihT
03b7788774
Vox now say they become fried chicken upon taking enough heat dmg (#42280) 
* Made it so that vox now say they become fried chicken upon taking enough heat dmg

* updated a comment to be more clear

* changed the name of bodyburnvox-text-other to bodyburn-vox-text-other

* forgot that I needed to also update the text in vox.yml to go with the previous commit change

* BurnBodyBehavior now takes bodyburn-text-others as default

* fixed suggested changes

* Relized I forgot to do a suggested change, I have now done it

* Update Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs

* Update Content.Server/Destructible/Thresholds/Behaviors/BurnBodyBehavior.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2026-01-07 19:24:19 +00:00
PJBot
66c1a989fd Automatic changelog update 2026-01-07 16:39:09 +00:00
Samuka
41f91a9207
Xenoborg camera monitor now shows xenoborgs names (#42205) 
* update camera id

* revert code changes in SharedSurveillanceCameraSystem

* why change camera id if you can just send the entity name
 2026-01-07 16:24:35 +00:00
āda
d65aa07a84
Grappling gun rope visual change (#42207) 
* sprite changes

* system changes

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2026-01-07 16:05:58 +00:00
ScarKy0
a8469ca509
Predict Rotting Examine (#42254) 
* init

* review

* test

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2026-01-07 15:58:28 +00:00
Kyle Tyo
20d1b2c6cb
Fix attributions for /Resources/Audio/Misc/ (#42230) 
* commit

* cleanup
 2026-01-07 15:33:22 +00:00
PJBot
e3419b159e Automatic changelog update 2026-01-07 06:06:18 +00:00
ScarKy0
590dc948ee
Chameleon Projector Battery, Price Decrease (#42271) 
* init

* fuck using

* glowup

* unused

* meta

* whuh

* review

* tests

* Update SharedChameleonProjectorSystem.cs
 2026-01-07 05:51:44 +00:00
PJBot
4ed0d37efc Automatic changelog update 2026-01-07 01:33:45 +00:00
0-Anon
de672944e0
Guarantee glue and lube in toybox (#42146) 
Update fun.yml
 2026-01-07 01:19:22 +00:00
Princess Cheeseballs
279dabd889
Merge stable into master (#42274) 
Fix admin loc spam 2 (#42265)

Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
 2026-01-06 13:51:13 -08:00
Princess Cheeseballs
5207c0694a
Fix admin loc spam 2 (#42265) 2026-01-06 20:29:10 +01:00
SnappingOpossum
2176f00f19
Replace recently added StorageFill with EntityTableContainerFill (#42269) 
I HATE STORAGE FILL
 2026-01-06 10:56:57 +00:00
PJBot
c81e671a74 Automatic changelog update 2026-01-06 10:42:41 +00:00
ThatGuyUSA
f92ed8418b
[FEATURE] More icons (#42200) 
* innit bruv, but also done!

* added comment to signify why it's like that

* init, but done

* init commit

* you think you got everythin, until you didn't

* credits and one last touch up

* i fucking hate git

* KILL OLD COMMITS

This reverts commit 6f834a51de611f215ede02f291a9d834777884a5.

* KILLING OLD COMMITS

This reverts commit 36e1f4a476b873f2326723740eccf455060520d8.

* I am going to become the joker

* one day i'll learn how to delete old commits properly

* god fucking damn it

* capitalization!
 2026-01-06 10:28:04 +00:00
Princess Cheeseballs
e2baaa1c31
Revert Closable Jugs (#42267) 
* remove lid

* remove changelog

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2026-01-06 07:02:44 +00:00
Velcroboy
cdd990ba56
Adds sky blue curtains/tables to their respective spawners (#42266) 
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
 2026-01-06 06:47:28 +00:00
PJBot
a287d5c3f7 Automatic changelog update 2026-01-06 04:40:05 +00:00
PicklOH
ae414ac94b
Fix da rulez (#42264) 2026-01-06 04:25:08 +00:00
SnappingOpossum
2a71253f57
Move some miscellaneous random spawners to entity tables (#42245) 
* Move some miscellaneous RandomSpawners to entity tables

* Fix a parenting issue and some conventions
 2026-01-06 00:14:02 +00:00
PJBot
19b1f4787f Automatic changelog update 2026-01-05 23:32:53 +00:00
IProduceWidgets
4b7aaa3a46
jugs closeable, move chemistry entities into chemistry directory (#29413) 
* jugs closeable, move chemitsry entities into chemsitry directory

* forgor to stage json. I hope i didnt stage robust :anxious:

* Who likes cargo? Not me. Lets remove it.

* Remove seal, make the amount examinable regardless of open or not, update jug icon

* apply iaada's parenting

* fix issues tdw parenting

* Review changes

* Fix sprite rename

* small touchup

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
 2026-01-05 23:18:23 +00:00
ScarKy0
54d7f2b736
Cleanup Toolshed Locale (#42259) 
* it begins

* god help me

* FINALLY
 2026-01-05 23:01:15 +00:00
PJBot
d3137c2d38 Automatic changelog update 2026-01-05 21:14:49 +00:00
ScarKy0
122feda215
Msg Toolshed Command (#41936) 
* init

* subfolder

* note
 2026-01-05 21:00:15 +00:00
slarticodefast
71c3fa8fd7
Predict thieving beacon (#39610) 
predict thieving beacon
 2026-01-05 12:17:17 +00:00
slarticodefast
e572d75f04
STABLE -> MASTER (#42251) 
Fix localization missing spam from Admin Overlay (#42244)

playerInfo.StartingJob is already localized

Co-authored-by: Centronias <me@centronias.com>
 2026-01-05 13:17:40 +01:00
Centronias
4d9c25098b
Fix localization missing spam from Admin Overlay (#42244) 
playerInfo.StartingJob is already localized
 2026-01-05 03:01:00 -08:00
John
62c1302a55
fixed typo/duplicate adjective (#42249) 
fixed typo/duplicate
 2026-01-05 06:54:20 +00:00
PJBot
d3d35000e1 Automatic changelog update 2026-01-05 00:43:37 +00:00
TheFlyingSentry
fa7c2be164
Dragon rift no longer deletes all rifts when destroyed (#42234) 
Maintaining the status quo
 2026-01-05 00:28:35 +00:00
Myra
fe6a2f0708
Stable to master (#42238) 
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2026-01-04 18:07:51 +01:00
Myra
3ad57230f4
Stable merge 2026-01-03 (#42237) 2026-01-04 17:50:01 +01:00
Vasilis The Pikachu
f007c75794
Changelog removal of reverted PRs 2026-01-04 17:30:59 +01:00
Vasilis The Pikachu
0ab3b1a075
Revert "feat: RnD tech research console now have reroll feature (#32931)" 
This reverts commit 1f2d80297c.

Discussed during the maintainer meeting and voted to be reverted at this time.
 2026-01-04 17:28:09 +01:00
Vasilis The Pikachu
a5977efab6
Revert "Santa anomaly back! (#41654)" 
This reverts commit 21d039318e.

Christmas, no longer a week away. Unwoo

PS: Please review https://github.com/space-wizards/space-station-14/pull/38940
 2026-01-04 17:25:36 +01:00
Vasilis The Pikachu
7c28daf1ed
Revert "Rename LOOC chat to Help chat (#41933)" 
This reverts commit 7750e3ca2e.

This will have another vulture round, it will be reapplied later after stable is merged back into master again
 2026-01-04 17:20:13 +01:00
github-actions[bot]
d7219bd499
Update Credits (#42228) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2026-01-04 05:27:04 +01:00
Princess Cheeseballs
3ab84443f9
[STAGING] Staging Chat Fix (#42206) 
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2026-01-04 01:24:18 +01:00
Princess Cheeseballs
e86cc06781
Cherrypick engine 270.1 to staging (#42226) 2026-01-03 15:56:54 -08:00
PJBot
4d19496dbd Automatic changelog update 2026-01-03 21:44:08 +00:00
Red
da4a488197
Melee weapons animations upgrade (#41425) 
* upgrading

* Update MeleeWeaponSystem.Effects.cs

* Easing
 2026-01-03 21:29:48 +00:00
Pieter-Jan Briers
9bd24023a7 Update RT to 270.1.0 (#42198) 2026-01-03 20:57:49 +01:00
Princess Cheeseballs
6cefe4299d
[Staging] Let admins ignore the laws of physics again. (#42221) 
admin ignore physics

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2026-01-03 20:39:17 +01:00