shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,968 Commits 5 Branches 0 Tags
bbcad2fa5862a0ea30cc290351b65d0d1703da3a
Commit Graph

1736 Commits

Author SHA1 Message Date
kevinz000 bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026) 
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
 2017-07-31 23:41:22 -07:00
LetterJay af581f8ab1 Merge pull request #2065 from Citadel-Station-13/upstream-merge-29280 
[MIRROR] Refactor Lung Handling
 2017-07-31 15:37:41 -05:00
ktccd a2f92461a4 Merge pull request #2210 from Citadel-Station-13/upstream-merge-29585 
[MIRROR] Improves several Sound Loops' Performance
 2017-07-31 22:06:17 +02:00
ktccd 9918ed7d0c Merge pull request #2204 from Citadel-Station-13/upstream-merge-29582 
[MIRROR] Update labor camp stacker accepted sheets.
 2017-07-31 22:04:28 +02:00
ktccd 55e2c49b5a Merge pull request #2203 from Citadel-Station-13/upstream-merge-29583 
[MIRROR] Fixes a cliffhanger comment
 2017-07-31 22:03:16 +02:00
ktccd b8c8f9d3b2 Merge pull request #2202 from Citadel-Station-13/upstream-merge-29577 
[MIRROR] Cyborgs grabbing ore works consistently
 2017-07-31 22:02:44 +02:00
ktccd 445fb5a395 Merge pull request #2196 from Citadel-Station-13/upstream-merge-29412 
[MIRROR] Colossus's shotgun is now a static-spread blast of 6 bolts
 2017-07-31 21:59:10 +02:00
ktccd f74baf59e7 Merge pull request #2186 from Citadel-Station-13/upstream-merge-29547 
[MIRROR] Player-controlled medibots are now alerted when they can't heal someone
 2017-07-31 21:48:50 +02:00
ktccd aa5ce7ebb1 Merge pull request #2166 from Citadel-Station-13/upstream-merge-29540 
[MIRROR] Fixes mutation toxins not stunning properly
 2017-07-31 21:46:03 +02:00
CitadelStationBot 3d53f888b1 Improves several Sound Loops' Performance 2017-07-31 14:35:16 -05:00
CitadelStationBot 29b26fbc3e Update labor camp stacker accepted sheets. 2017-07-31 08:57:59 -05:00
CitadelStationBot 2d74f9f45a Fixes a cliffhanger comment 2017-07-31 08:57:56 -05:00
CitadelStationBot d3f488a5ee Cyborgs grabbing ore works consistently 2017-07-31 07:10:17 -05:00
LetterJay 8a174f8a76 Update damage_procs.dm 2017-07-31 06:24:52 -05:00
Poojawa f53d66b319 Rabbit parts (#2201) 2017-07-31 05:54:16 -05:00
LetterJay 62d7f47497 Merge pull request #2170 from Citadel-Station-13/upstream-merge-29455 
[MIRROR] Adds 3D Sound System
 2017-07-31 03:43:20 -05:00
LetterJay 35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
LetterJay 79bf3edab9 Update syndi.dm 2017-07-31 02:14:50 -05:00
LetterJay 4f324214c5 Update plasmamen.dm 2017-07-31 02:14:15 -05:00
LetterJay 0bba1ec9b6 Update miscellaneous.dm 2017-07-31 02:13:42 -05:00
LetterJay fe37d52cc5 Update hardsuit.dm 2017-07-31 02:12:22 -05:00
LetterJay f90ddf0596 Update lizard.dm 2017-07-30 23:35:11 -05:00
LetterJay bdcc4bc429 Update miscellaneous.dm 2017-07-30 23:33:58 -05:00
LetterJay 4c0c11524b Update syndi.dm 2017-07-30 23:32:50 -05:00
LetterJay a99fa2ea49 Update plasmamen.dm 2017-07-30 23:31:33 -05:00
LetterJay e3dfc8b61d Update miscellaneous.dm 2017-07-30 23:30:51 -05:00
LetterJay 85885330ba Update hardsuit.dm 2017-07-30 23:29:36 -05:00
LetterJay c2a1a62a2d Merge pull request #2154 from Citadel-Station-13/upstream-merge-29504 
[MIRROR] Alcohol Bottle Resprite
 2017-07-30 23:15:33 -05:00
CitadelStationBot b953db165d Colossus's shotgun is now a static-spread blast of 6 bolts 2017-07-30 19:58:21 -05:00
CitadelStationBot 5da5e58ee5 Fixes a lot of eye damage procs 2017-07-30 08:16:38 -05:00
LetterJay 70a5aed428 Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977 
[MIRROR] Augment Styles/Changes
 2017-07-29 23:56:52 -05:00
CitadelStationBot 95f900a97d Adds emergency toolbox to escape pod supplies (#2182) 2017-07-29 19:51:55 -07:00
CitadelStationBot 2d82262e50 Fixes syringes being unable to inject at all if the target has thick clothing on any slot (#2184) 2017-07-29 19:50:37 -07:00
CitadelStationBot 2342c8f2bc Fixes scythes cutting kudzu (#2185) 2017-07-29 19:50:24 -07:00
CitadelStationBot 70df3e8557 Player-controlled medibots are now alerted when they can't heal someone 2017-07-29 19:44:44 -05:00
CitadelStationBot adc7a52b8d BYPASSES THE DEEP FREEZE (#2168) 2017-07-28 23:51:24 -07:00
CitadelStationBot 64b721ae4f Halloween Costumes (#2169) 2017-07-28 23:51:11 -07:00
CitadelStationBot 3db9c9ddb7 Adds 3D Sound System 2017-07-28 09:02:21 -05:00
CitadelStationBot e3334ad1a8 Fixes mutation toxins not stunning properly 2017-07-28 09:02:02 -05:00
CitadelStationBot 3f8acbc2c4 Removes bows (#2163) 2017-07-28 02:53:47 -07:00
CitadelStationBot 8cb2b1b59e Fixes SDQL for (hopefully) the last time by removing try catches. Removes automatic runtime tracking from SDQL. (#2160) 2017-07-27 06:44:45 -07:00
ktccd c52f7a0475 Delayed objective (#2140) 
Delayed objective [Latejoiners can now be selected as traitor targets]
 2017-07-27 05:27:58 -07:00
CitadelStationBot 452421cd1b Alcohol Bottle Resprite 2017-07-27 06:56:56 -05:00
CitadelStationBot e085c33ac5 Makes narsie less huge (#2144) 2017-07-26 22:57:11 -07:00
LetterJay 471f9d064b Merge pull request #2142 from Citadel-Station-13/upstream-merge-29493 
[MIRROR] Fixes guns staying zoomed in after being unequipped
 2017-07-26 19:52:19 -05:00
LetterJay 2aacff25ad Merge pull request #2141 from Citadel-Station-13/upstream-merge-29495 
[MIRROR] Portals do not go on supply shuttles
 2017-07-26 19:52:03 -05:00
CitadelStationBot 4e6e4faed8 Adds a mini fire extinguisher to janitor and service borgs 2017-07-26 15:45:10 -05:00
CitadelStationBot cc9330a2ec Fixes guns staying zoomed in after being unequipped 2017-07-26 15:44:54 -05:00
CitadelStationBot c3329f1b84 Portals do not go on supply shuttles 2017-07-26 15:44:51 -05:00
CitadelStationBot 147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00