shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,008 Commits 5 Branches 0 Tags
2821dcff07d72e46c07c4e9067aaa9363a4469fd
Commit Graph

12008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot 2821dcff07 Automatic changelog generation for PR #4879 [ci skip] 2018-01-17 09:36:58 -06:00
LetterJay 9fbbb018e8 Merge pull request #4879 from Citadel-Station-13/upstream-merge-34457 
[MIRROR] Combine and fix Show Air Status and Air Status in Location
 2018-01-17 09:36:56 -06:00
LetterJay 8a04f19e0a Merge pull request #4877 from Citadel-Station-13/upstream-merge-34470 
[MIRROR] Moves load_motd to config controller
 2018-01-17 09:36:43 -06:00
CitadelStationBot 895dbc2ef6 Automatic changelog generation for PR #4876 [ci skip] 2018-01-17 09:36:36 -06:00
LetterJay a05b64c7e7 Merge pull request #4876 from Citadel-Station-13/upstream-merge-34429 
[MIRROR] Fix RPD embedding fixtures inside lattices and girders
 2018-01-17 09:36:33 -06:00
LetterJay 5329408366 Merge pull request #4880 from Citadel-Station-13/upstream-merge-34477 
[MIRROR] Adds component incompatible crash to root level so everything doesn't have to do it itself
 2018-01-17 09:36:20 -06:00
LetterJay 3d045b87e2 Merge pull request #4878 from Citadel-Station-13/upstream-merge-34413 
[MIRROR] Allows C4 on mobs again
 2018-01-17 07:26:38 -06:00
CitadelStationBot dafa0f0a7a Adds component incompatible crash to root level so everything doesn't have to do it itself 2018-01-16 14:29:40 -06:00
oranges b128a28cf3 Merge pull request #34477 from tgstation/Cyberboss-patch-2 
Adds component incompatible crash to root level so everything doesn't have to do it itself
 2018-01-16 14:29:40 -06:00
CitadelStationBot 9356dd733e Combine and fix Show Air Status and Air Status in Location 2018-01-16 14:29:29 -06:00
oranges 9dda16954b Merge pull request #34457 from AutomaticFrenzy/patch/air-status 
Combine and fix Show Air Status and Air Status in Location
 2018-01-16 14:29:29 -06:00
CitadelStationBot aaf9250a4a Allows C4 on mobs again 2018-01-16 14:28:17 -06:00
oranges 1f7e25be0a Merge pull request #34413 from kevinz000/patch-430 
Allows C4 on mobs again
 2018-01-16 14:28:17 -06:00
CitadelStationBot 62a8edd6b4 Moves load_motd to config controller 2018-01-16 14:28:07 -06:00
oranges 2dd1f1f799 Merge pull request #34470 from Cyberboss/MoveMotd 
Moves load_motd to config controller
 2018-01-16 14:28:07 -06:00
CitadelStationBot 74d2eb4332 Fix RPD embedding fixtures inside lattices and girders 2018-01-16 14:26:53 -06:00
oranges 9ff1be35cc Merge pull request #34429 from AutomaticFrenzy/patch/rpd-bad-placement 
Fix RPD embedding fixtures inside lattices and girders
 2018-01-16 14:26:53 -06:00
CitadelStationBot d2d1a063a7 Automatic changelog generation for PR #4875 [ci skip] 2018-01-16 13:50:32 -06:00
LetterJay 6bcd56a0f3 Merge pull request #4875 from Citadel-Station-13/upstream-merge-34482 
[MIRROR] Drone dispensers no longer trap the drones below them forcing ghosts to altclick
 2018-01-16 13:50:29 -06:00
CitadelStationBot 83226705df Automatic changelog generation for PR #4874 [ci skip] 2018-01-16 13:50:12 -06:00
LetterJay 36dd99b376 Merge pull request #4874 from Citadel-Station-13/upstream-merge-34505 
[MIRROR] Fix Camera Failure crashing the server if there are no cameras
 2018-01-16 13:50:10 -06:00
CitadelStationBot 70a9fbaacb Automatic changelog generation for PR #4873 [ci skip] 2018-01-16 13:49:56 -06:00
LetterJay df1e76aa5f Merge pull request #4873 from Citadel-Station-13/upstream-merge-34484 
[MIRROR] Ash storms are no longer so LOUD inside buildings.
 2018-01-16 13:49:53 -06:00
CitadelStationBot 1761f69114 Automatic changelog generation for PR #4872 [ci skip] 2018-01-16 13:49:34 -06:00
LetterJay 05989168e7 Merge pull request #4872 from Citadel-Station-13/upstream-merge-34401 
[MIRROR] Stray bullets and explosions don't blow up the entire syndi lava base anymore
 2018-01-16 13:49:32 -06:00
CitadelStationBot 920a916161 Automatic changelog generation for PR #4871 [ci skip] 2018-01-16 13:49:21 -06:00
LetterJay 7d7042fc60 Merge pull request #4871 from Citadel-Station-13/upstream-merge-34475 
[MIRROR] Makes tanks made of metal
 2018-01-16 13:49:18 -06:00
LetterJay fce1c1232a Merge pull request #4870 from Citadel-Station-13/upstream-merge-34315 
[MIRROR] Calling WEAKREF with a /datum/weakref returns the input
 2018-01-16 13:49:06 -06:00
LetterJay fcb61314fd Merge pull request #4869 from Citadel-Station-13/upstream-merge-34478 
[MIRROR] Fixes a variety of runtimes that happen if a servant tries to access scripture without servants being properly active
 2018-01-16 13:48:57 -06:00
CitadelStationBot 0225e4a82f Automatic changelog generation for PR #4868 [ci skip] 2018-01-16 13:48:42 -06:00
LetterJay 01344aacdf Merge pull request #4868 from Citadel-Station-13/upstream-merge-34171 
[MIRROR] Refactors how flashes get targets and whatnot, so they no longer work from inside containers to outside.
 2018-01-16 13:48:40 -06:00
CitadelStationBot 627e7f5226 Automatic changelog generation for PR #4867 [ci skip] 2018-01-16 13:48:29 -06:00
LetterJay ba5d3c8938 Merge pull request #4867 from Citadel-Station-13/upstream-merge-34479 
[MIRROR] newly built air alarms now start unlocked too, this isn't powercreep this is quality of life
 2018-01-16 13:48:26 -06:00
CitadelStationBot e70c57a325 Automatic changelog generation for PR #4866 [ci skip] 2018-01-16 13:48:11 -06:00
LetterJay 37a8f80355 Merge pull request #4866 from Citadel-Station-13/upstream-merge-34491 
[MIRROR] Adds a new bar sign, The Lightbulb (take 2)
 2018-01-16 13:48:08 -06:00
CitadelStationBot 03cc73c723 Automatic changelog generation for PR #4864 [ci skip] 2018-01-16 13:47:52 -06:00
LetterJay 8b89832d76 Merge pull request #4864 from Citadel-Station-13/upstream-merge-34463 
[MIRROR] Fixes duplicate reagents in chemistry macros
 2018-01-16 13:47:50 -06:00
CitadelStationBot 2e37263899 Automatic changelog generation for PR #4863 [ci skip] 2018-01-16 13:47:41 -06:00
LetterJay f289433d08 Merge pull request #4863 from Citadel-Station-13/upstream-merge-34461 
[MIRROR] Fix heat-exchange manifold icons facing the wrong way
 2018-01-16 13:47:38 -06:00
LetterJay 4f85c676b2 Merge pull request #4862 from Citadel-Station-13/upstream-merge-34455 
[MIRROR] Fixes shuttle console negative auths needed
 2018-01-16 13:47:22 -06:00
LetterJay 2f2b98c4eb Merge pull request #4861 from Citadel-Station-13/upstream-merge-34460 
[MIRROR] Fixes ChangeTurf runtimes in late loaded templates.
 2018-01-16 13:47:10 -06:00
CitadelStationBot f2d1bff04e Automatic changelog generation for PR #4860 [ci skip] 2018-01-16 13:46:54 -06:00
LetterJay 8debf46bed Merge pull request #4860 from Citadel-Station-13/upstream-merge-34199 
[MIRROR] Makes getFlatIcon slower. (Also more precise)
 2018-01-16 13:46:52 -06:00
CitadelStationBot 42a68f4e54 Automatic changelog generation for PR #4859 [ci skip] 2018-01-16 13:46:30 -06:00
LetterJay bdcb7d2465 Merge pull request #4859 from Citadel-Station-13/upstream-merge-34471 
[MIRROR] No more air leaks from the asteroid shuttle
 2018-01-16 13:46:27 -06:00
CitadelStationBot fa15882ba4 Drone dispensers no longer trap the drones below them forcing ghosts to altclick 2018-01-16 08:45:17 -06:00
F-OS 3608165d7f Drone dispensers no longer trap the drones below them forcing ghosts to altclick (#34482) 
* Update drones_as_items.dm

* Update drones_as_items.dm

* Update drones_as_items.dm

* Update drones_as_items.dm

* I've got PRs to close, no time to wait on you
 2018-01-16 08:45:16 -06:00
CitadelStationBot e4b81c687e Fix Camera Failure crashing the server if there are no cameras 2018-01-16 08:39:54 -06:00
Jordan Brown 5e7e4c934d Merge pull request #34505 from AutomaticFrenzy/patch/camera-failure-crash 
Fix Camera Failure crashing the server if there are no cameras
 2018-01-16 08:39:54 -06:00
CitadelStationBot ad8e642340 Ash storms are no longer so LOUD inside buildings. 2018-01-16 08:38:42 -06:00