space-syndicate/space-station-14
1
0
Fork 1
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-06-09 12:26:34 +02:00
Code Issues Packages Projects Releases Wiki Activity
41,743 Commits 14 Branches 0 Tags
master
Commit Graph

41743 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
_Svist_ 939e514e5d Добавление возможности вызвать НЕ отзываемый шаттл (#3555) 2026-06-09 16:27:18 +07:00
_Svist_ 7e11269e2a Обновление КЗ (#3623) 2026-06-09 10:56:53 +03:00
KloopRE 8235c568c2 Merge pull request #3602 from KloopRE/ahelp 
отображение префиксов ролей администратора и антагониста в UI Ahelp
 2026-06-08 19:34:52 +07:00
Dmitry 542b64ab04 Merge pull request #3621 from DIMMoon1/upstream06.1 
Upstream 06.1
 2026-06-08 13:05:18 +07:00
Dmitry 13ce37ab36 rot clearing( 2026-06-08 03:02:11 +07:00
Dmitry 224f1f0f78 rot clearing 2026-06-08 00:37:19 +07:00
Dmitry 99e8ce8eeb butcheringType fix 2026-06-07 21:04:29 +07:00
Dmitry 1df5138e57 Merge remote-tracking branch 'origin/master' into upstream06.1 2026-06-07 20:40:13 +07:00
Elusive 8926229e2b Merge pull request #3615 from ElusiveTheDrake/locale-up05-3605 
Locale - UP05#3605
 2026-06-07 20:24:43 +07:00
_Svist_ e401dd0ce1 Лодаут АВД (#3620) 2026-06-07 20:00:39 +07:00
Dmitry dc26a49ca3 fix 2026-06-07 19:37:04 +07:00
Dmitry c4c42f567d merge remote wizden/master 2026-06-07 19:36:24 +07:00
_Svist_ 10f4992b06 Снова изменение спрайта факса (#3618) 2026-06-07 01:32:08 +03:00
PJBot 480f0ca376 Automatic changelog update 2026-06-05 15:25:46 +00:00
Zekins d7d72c1db8 Construction Cache Reload (#44243) 
ConstructionReload
 2026-06-05 15:06:30 +00:00
Whatstone 043c1d6b60 Remove instances of the broken Caution style class (#44244) 2026-06-05 15:02:16 +00:00
_Svist_ a972ff2f77 СРП: энергодробовик и стажёры на ВрИО (#3617) 2026-06-05 02:03:39 +03:00
PJBot 1520aa03dc Automatic changelog update 2026-06-04 22:39:32 +00:00
Andrew Malcolm O'Neill 1b7dbb3aba chore(guidebook): Updating uplink information (#44240) 
* chore(guidebook): Updating uplink information

- Updating reference to let players know that the code can be used on any PDA by any player if shared

* Web commit
 2026-06-04 22:20:36 +00:00
PJBot 34007d6489 Automatic changelog update 2026-06-04 21:20:01 +00:00
portfiend 350a0e69d4 fix remaining butcherable components (#44225) 
* relocalize these two messages

* fix erroneous butcherable components pt 1

* fix argocyte butchery

* redundant
 2026-06-04 20:59:53 +00:00
Pok 61f98c14d3 Changeling reagent stings (#43805) 
* Changeling-Stings

* update yml

* attempt failed dead

* sprite and ChangelingNeurodepressantSting

* Update changeling_catalog.yml

* merge

* update

* review

* review 2

* clean up, remove non-blind stings

* fix stuff

* lethal, cryogenic, hallucination + armblade  nerf

* validate deez

* a

* review

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2026-06-04 19:29:21 +00:00
PJBot 9cfddca15c Automatic changelog update 2026-06-04 17:51:58 +00:00
Matrix 32c39d1110 add a drum kit (#42987) 
* DrumKit

A drum unit was added to the cargo for 1500 speso, which exclusively plays channel 9 through a crutch with an “empty” sound font.

* Apply suggestion from @noxypaws

Co-authored-by: Noxy <n@aux.sh>

* prototype fix

---------

Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: Noxy <n@aux.sh>
 2026-06-04 17:31:57 +00:00
B_Kirill 124c16e11e Meat spike localization fixes (#44191) 
* Meat spike localization fixes

* Review
 2026-06-04 10:26:27 +00:00
Ignaz "Ian" Kraft 5f61dda4ef make TestAdminLogsWindow more reliable (#43710) 2026-06-04 04:08:14 +00:00
KeTuFaisPiKiNut c588cad971 Changeling Random Objectives (#44212) 
* changeling random objectives

* addressed slarti's comments (i think :godo:)

* Apply suggestion from @slarticodefast

---------

Co-authored-by: nomdéraisonnablementlong <you@example.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2026-06-03 22:36:54 +00:00
Tayrtahn 45b77c2c25 Fix GameTest.CTryComp using the server entity manager (#44230) 
Fix GameTest.CTryComp using the server entity manager
 2026-06-03 21:01:14 +00:00
PJBot 27d23df0d1 Automatic changelog update 2026-06-03 19:23:22 +00:00
ScarKy0 946a516d72 Make NumberObjective Max inclusive (#44228) 
* yeah

* comment

* Apply suggestion from @slarticodefast

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2026-06-03 19:03:40 +00:00
PJBot 34160b2eea Automatic changelog update 2026-06-03 16:57:59 +00:00
Samuka 61d5f0ea39 Slown down super bonk smite (#44223) 
* make it 1.5 seconds

* empty commit
 2026-06-03 16:39:20 +00:00
ArtisticRoomba faa9ead594 Migrate Atmospherics to TensorPrimitives (#44139) 2026-06-02 12:52:50 -07:00
_Svist_ c6175e6e68 Уточнение формулировок в КЗ (#3616) 2026-06-02 20:16:51 +03:00
PJBot 96a977a8a2 Automatic changelog update 2026-06-02 04:24:26 +00:00
Rami d8f546748f Fix Organs being Unedible (#44197) 
* Fix Organs being InEditable

* Fix Spelling mistake

* Requested change

* I love breaking changes

* shrink solution volume

* fix lizards being unable to eat raw meat

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2026-06-02 04:06:07 +00:00
PJBot 5611fb459d Automatic changelog update 2026-06-02 03:04:02 +00:00
Princess Cheeseballs b5a8acdf9f [MICROBALANCE PR] Explosives no longer pierce armor (#40090) 
* Explosiv nerf

* Minor changes

* Whoops

* whoopsie doodles.

* Address half of the review.

* forgot this too (flat reductions are applied before the modifier so we need to account for that :P)

* fix merge conflicts

* it's time

* whoops

* me when I logmissing true

* they call me the forgor cause I forgor

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2026-06-02 02:50:53 +00:00
PJBot b2e9308ca0 Automatic changelog update 2026-06-02 01:32:46 +00:00
Ewanderer 1e73c99d69 constructed toilets no longer can spawn items (#44210) 
* made constructed toilet not plungable and not rummagable to avoid item generation.

* cleaning up and adding comment.

* restored solution generation to base toilet

* Update Resources/Prototypes/Entities/Structures/Furniture/toilet.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2026-06-02 01:13:52 +00:00
KeTuFaisPiKiNut c57976f209 Evil Changeling Shop Icon (#44203) 
ye ole shoppe

Co-authored-by: nomdéraisonnablementlong <you@example.com>
 2026-06-01 21:18:36 +00:00
PJBot 17dc62f996 Automatic changelog update 2026-06-01 21:31:01 +00:00
Whatstone 1c44d95c2b Bugfix: Banana cream pies stun when target is already creamed (#44209) 
OnCreamPiedHitBy: Paralyze before exit
 2026-06-01 20:56:21 +00:00
Kyle Tyo 7b022c09a5 Fix ToggleRoundEndSummaryWindow requiring two presses. (#44206) 
Update keybinds.yml
 2026-06-01 20:42:58 +00:00
Dmitry ac1df8dabc Merge pull request #3614 from DIMMoon1/stable 
fix
 2026-06-01 22:17:21 +07:00
Dmitry e157eb3e9d Merge remote-tracking branch 'space-wizards/stable' into stable 2026-06-01 22:06:09 +07:00
Mora dfd42624f2 [Aseprite Tool] Add Copy Displaced To New Canvas Button (#41614) 
Add Copy Displaced To New Canvas button

Co-authored-by: TrixxedHeart <46364955+TrixxedBit@users.noreply.github.com>
 2026-06-01 03:48:00 +00:00
Whatstone 2e35342b7b Restore foam IconSmooth key (#44182) 
restore foam merge key
 2026-05-31 20:10:54 +00:00
PJBot 12ca6aa635 Automatic changelog update 2026-05-31 20:14:07 +00:00
B_Kirill 470acb50b0 Fix shooting from inside a morgue exploit (#44188) 
Fix shooting inside morgue exploit
 2026-05-31 19:50:48 +00:00