NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-11-12 22:14:15 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
35078 commits 14 branches 0 tags 3 GiB
Commit graph

35078 commits

This branch
This branch
All branches
Author SHA1 Message Date
ArtisticRoomba
af2fd9950c
Bagel Theater will randomly spawn in partially broken (#41794) 
* Revert "Sometimes the Bagel Theater doesn't like showing up to work (#41787)"

This reverts commit c0e90815d9.

* Reapply "Sometimes the Bagel Theater doesn't like showing up to work (#41787)"

This reverts commit 114266990897d338ef25fa435d0ad7350457dd63.

* remove blank

* upd CL
 2025-12-08 17:29:24 +00:00
Exetron
e8f018bd8f
Fix batteries not counting towards the battery bounty (#41792) 
add PredictedBattery
 2025-12-08 16:21:04 +00:00
PJBot
a99452fbb8 Automatic changelog update 2025-12-08 15:27:14 +00:00
ArtisticRoomba
c0e90815d9
Sometimes the Bagel Theater doesn't like showing up to work (#41787) 2025-12-08 07:26:04 -08:00
Red
9c2dc04519
Clothing equipping doAfter tweak (#41732) 
* clothing moving break

* Rename EquipOnMoving to EquipWhileMoving

* Update InventorySystem.Equip.cs
 2025-12-08 11:20:42 +00:00
slarticodefast
0031beca4b
Reapply "Trip APCs when they exceed a power limit (#41377)" (#41789) 
Revert "Merge stable into master"
 2025-12-08 10:35:11 +00:00
slarticodefast
406231cdb3
Merge stable into master (#41781) 
Revert "Trip APCs when they exceed a power limit (#41377)" (#41766)

This reverts commit a5c223c0

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-12-08 11:14:13 +01:00
ArtisticRoomba
32c1c44367
fix CL AGAIN (#41782) 2025-12-07 21:08:48 -08:00
sleepyyapril
f1443f0cd7
TriggerOn(Un)Embed (#41720) 
* feat: TriggerOn(Un)Embed

* feat: StopEmbedEvent

* fix: forgot initialize

* chore: better naming

* chore: oops

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnUnembedComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Projectiles/EmbedEvents.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* review

im lazy

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnEmbedComponent.cs

* chore: docs

* comment change

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-12-08 04:20:42 +00:00
ArtisticRoomba
c867adb937
Revert "Trip APCs when they exceed a power limit (#41377)" (#41766) 
This reverts commit a5c223c0
 2025-12-08 04:23:45 +01:00
PJBot
25bb98c1a2 Automatic changelog update 2025-12-08 01:50:49 +00:00
UpAndLeaves
fde6129e5f
Allow removing species from the RNG pool of a new player's initial auto-generated character (#41678) 
* First commit

* Fix it!

* Requested Changes
 2025-12-08 01:37:06 +00:00
PJBot
5fa2028ce9 Automatic changelog update 2025-12-08 01:24:10 +00:00
Princess Cheeseballs
36e009f21e
Fix Bible Fast Healing (#41777) 
* broble

* slightly cleaner I guess actually

* im straight refactoring it, and by it, i mean.... my entity

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-12-08 01:10:28 +00:00
PJBot
4bfa0a6eaf Automatic changelog update 2025-12-08 01:03:57 +00:00
ArtisticRoomba
8dc131dec6
fix oasis APC powernet (#41776) 2025-12-07 17:02:48 -08:00
PJBot
94ff457967 Automatic changelog update 2025-12-08 00:36:59 +00:00
ArtisticRoomba
84ce9522b7
fix fland APC powernet (#41773) 2025-12-07 16:35:49 -08:00
ArtisticRoomba
c8b71f8989
fix elkridge APC powernet (#41772) 2025-12-07 16:35:29 -08:00
ArtisticRoomba
8a29a8d813
fix CC APC powernet (#41771) 2025-12-07 16:35:01 -08:00
ArtisticRoomba
9806153b93
fix box APC powernet (#41770) 2025-12-07 16:34:25 -08:00
PJBot
7bc1e94b47 Automatic changelog update 2025-12-07 22:41:58 +00:00
Tiniest Shark
4f2d2208f5
Misc Proper Rotation Sprites (#41764) 
* Proper rotation sprites.

* copyright mentions

* wrong one

* better ointment
 2025-12-07 22:28:39 +00:00
ArtisticRoomba
e8462ebe55
fix bagel APC powernet (#41769) 2025-12-07 22:28:31 +00:00
PJBot
d79065bdbb Automatic changelog update 2025-12-07 20:40:58 +00:00
Hitlinemoss
9d13d348b4
Remove map list from station-specific jobs' descriptions (#41748) 2025-12-07 20:27:49 +00:00
Tiniest Shark
0eead492de
Reverts Mop + Glowstick Storage Rotation (#41765) 
diagonal pixels are ugly, sorry.
 2025-12-07 20:14:49 +00:00
RedSpy
5fdba3f0bc
Hitscans now have names (#41763) 
Co-authored-by: RedSpyy <empty@place.com>
 2025-12-07 20:10:01 +00:00
sleepyyapril
5c70d28927
TriggerOnUiOpen/Close (#41718) 
* feat: TriggerOnUiOpen/Close

* chore: minor clarification

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnUiCloseComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnUiOpenComponent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* chore: review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-12-07 19:54:10 +00:00
PJBot
7cc256890b Automatic changelog update 2025-12-07 18:05:58 +00:00
Samuka
ee2e1eb932
Make xenoborg light brighter (#41580) 
* make light better

* minor color fix
 2025-12-07 17:52:27 +00:00
cammusubi
5b7d3757e6
Green Glowsticks are their own entity (#41712) 
* Addresses and resolves Issue #41145, creates a separate entity for green glowsticks, which were previously just the base glowstick.

* Adds old+new ID for green glowsticks to migration.yml, refactors formatting in glowstick.yml
 2025-12-07 16:36:20 +00:00
PJBot
f99b59b7ed Automatic changelog update 2025-12-07 16:48:22 +00:00
metalgearsloth
51b7af73f7
Double bullet speeds (#34971) 
* Double bullet speeds

The only reason we had it at 20m/s was tunneling reasons.

The quick maths is (BodyA size + BodyB size) / frametime. Currently the game is doing substepping AFAIK so we can use 0.016 as the frametime therefore with a 0.40 width body we can get up to 40.625 (assuming the target is no narrower than 0.25 which given my thindows change last year should be a decently safe assumption).

* Fix

* Fix impact visuals, as they overshoot otherwise

* Revert changes

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
 2025-12-07 16:35:06 +00:00
PJBot
94327566ef Automatic changelog update 2025-12-07 16:28:11 +00:00
Princess Cheeseballs
34f60c115e
Add GenPop Enter/Leave to ID Card Computer. Add shuffle the accesses a bit. (#41739) 
fixe

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-12-07 16:14:38 +00:00
Myra
7b3c83c565
Fix box shuttle from overloading instantly (#41753) (Stable merge) (#41760) 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-12-07 16:14:15 +01:00
Myra
db366bc20d
Stable release (#41759) 2025-12-07 16:13:23 +01:00
PJBot
58b23d3162 Automatic changelog update 2025-12-07 13:39:15 +00:00
Velken
c164897ead
Snap Booms (fake snap pops) (#38654) 
* snap booms

* damage nerf

* fixing brain issue of being 8am and i havent slept yet

* typo

* Update damage and name

* Fix linter issues

* fixed typo snapPopFake -> snapPopExplosive

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
 2025-12-07 13:25:57 +00:00
PJBot
e0299c9afa Automatic changelog update 2025-12-07 11:57:19 +00:00
Hitlinemoss
35ea5f1820
Fixed hyperzine (micro)injector descriptions (#41755) 2025-12-07 11:42:34 +00:00
ArtisticRoomba
18013339b0
Fix box shuttle from overloading instantly (#41753) 2025-12-07 02:00:58 -08:00
PJBot
113507d4b4 Automatic changelog update 2025-12-07 03:21:00 +00:00
SlamBamActionman
58f884133b
Remove Zookeeper and Boxer jobs (#41741) 2025-12-07 03:07:32 +00:00
PJBot
c9ebb1b6b7 Automatic changelog update 2025-12-07 02:49:13 +00:00
beck-thompson
dd79254a0f
Add voice mask implant (#41551) 
* Add voice mask implant

* Remove voice mask

* Voice mask implant now  overrides your identity

* voice mask implant can now be extracted, when taking out the voice mask implant it now updates your name proplery

* Simplify logic
 2025-12-07 02:35:46 +00:00
github-actions[bot]
49656df410
Update Credits (#41750) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2025-12-07 01:50:18 +01:00
PJBot
9e71a4212b Automatic changelog update 2025-12-06 20:54:00 +00:00
August Sun
9bd27fd245
Adds the sticky grappling hand (#37551) 
* Adds sprites, entity and sounds for sticky grappling hand

* Switched audio to mono

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

Co-authored-by: āda <ss.adasts@gmail.com>

* Added empty sound, changed yaml to suit conventions, added description

---------

Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com>
Co-authored-by: āda <ss.adasts@gmail.com>
Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-12-06 20:40:37 +00:00