shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,055 Commits 5 Branches 0 Tags
b83f30a1eac70c08babd4e54e86355288387c4a9
Commit Graph
11055 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot 2ac9c4cf19 Material containers only insert on help intent 2017-12-26 09:25:14 -06:00
LeoandCitadelStationBot 2da318a9a5 Merge pull request #33820 from tgstation/Cyberboss-patch-4 
Material containers only insert on help intent
 2017-12-26 09:25:14 -06:00
LeoandCitadelStationBot 889e281a57 Revert "Vending TGUI" 2017-12-26 09:10:48 -06:00
LetterJayandGitHub ab1965b3a2 Merge pull request #4398 from Citadel-Station-13/upstream-merge-32916 
[MIRROR] [READY] Monkey mode overhaul
 2017-12-26 08:38:42 -06:00
LetterJay 290c1e0868 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916 2017-12-26 08:24:20 -06:00
LetterJayandGitHub 14472e5139 Merge pull request #4443 from Citadel-Station-13/upstream-merge-33485 
[MIRROR] code improvements from mso and co
 2017-12-26 07:38:17 -06:00
CitadelStationBot d36b3e036b Automatic changelog generation for PR #4447 [ci skip] 2017-12-26 07:38:08 -06:00
LetterJayandGitHub 7be17b6f12 Merge pull request #4447 from Citadel-Station-13/upstream-merge-33639 
[MIRROR] Golems can wear labcoats
 2017-12-26 07:38:06 -06:00
LetterJayandGitHub 4cfb2e323b Merge branch 'master' into upstream-merge-33504 2017-12-26 06:08:12 -06:00
CitadelStationBot 29e221c3f9 Automatic changelog generation for PR #4503 [ci skip] 2017-12-26 05:59:54 -06:00
LetterJayandGitHub 358c625ed3 Merge pull request #4503 from Citadel-Station-13/upstream-merge-33590 
[MIRROR] [READY]Clownborgs - ADMIN SPAWN ONLY
 2017-12-26 05:59:52 -06:00
CitadelStationBot 69a12f0557 Automatic changelog generation for PR #4472 [ci skip] 2017-12-26 05:29:44 -06:00
LetterJayandGitHub e4f39a97c3 Merge pull request #4472 from Citadel-Station-13/upstream-merge-33634 
[MIRROR] (probably?) Fixes being able to create two Eminences at a time + other Eminence issues
 2017-12-26 05:29:42 -06:00
LetterJayandGitHub 95642e631f Update shuttle.dm 2017-12-26 05:28:55 -06:00
LetterJayandGitHub e51baed92e Update labcoat.dm 2017-12-26 05:27:01 -06:00
CitadelStationBot 6a15f4e575 Cut through handcuffs with power wirecutters 2017-12-26 00:14:24 -06:00
Matt SmithandCitadelStationBot 7b159e204c Cut through handcuffs with power wirecutters (#33822) 
* Cut through handcuffs with power wirecutters

* unbuckle is handled on delete of the handcuffs
 2017-12-26 00:14:24 -06:00
CitadelStationBot 44cf8cd6ad Fixes deleting handcuffs 2017-12-26 00:13:13 -06:00
ShizCalevandCitadelStationBot 3ea4e84719 Fixes deleting handcuffs (#33821) 
* Fixes deleting handcuffs

* cleanup
 2017-12-26 00:13:13 -06:00
LetterJayandGitHub 9eb78791a9 Update aux_base.dm 2017-12-25 22:53:44 -06:00
CitadelStationBot 072e5b32ae Automatic changelog generation for PR #4527 [ci skip] 2017-12-25 22:25:57 -06:00
LetterJayandGitHub 4b79ee5e94 Merge pull request #4527 from Citadel-Station-13/upstream-merge-33736 
[MIRROR] Ghosts can *spin and *flip
 2017-12-25 22:25:54 -06:00
LetterJayandGitHub 4cefd9219f Update say.dm 2017-12-25 21:32:05 -06:00
LetterJayandGitHub a7a0823594 Update say.dm 2017-12-25 21:31:50 -06:00
LetterJayandGitHub 41bae055ba Merge pull request #4524 from Citadel-Station-13/upstream-merge-33816 
[MIRROR] gives medical some medical boards, but not their own circuit imprinter yet
 2017-12-25 21:30:31 -06:00
LetterJayandGitHub 50672ecf93 Merge pull request #4512 from Citadel-Station-13/upstream-merge-33752 
[MIRROR] Fixes eminence login
 2017-12-25 21:29:21 -06:00
LetterJayandGitHub 5dd7136225 Merge branch 'master' into upstream-merge-33590 2017-12-25 21:29:18 -06:00
CitadelStationBot adfb04fa6d Automatic changelog generation for PR #4492 [ci skip] 2017-12-25 21:27:42 -06:00
LetterJayandGitHub 8cd36f9927 Merge pull request #4492 from Citadel-Station-13/upstream-merge-33711 
[MIRROR] adds mining scanners to the gulag
 2017-12-25 21:27:39 -06:00
CitadelStationBot fcf707ad66 Automatic changelog generation for PR #4482 [ci skip] 2017-12-25 21:27:20 -06:00
LetterJayandGitHub 91e87bf801 Merge pull request #4482 from Citadel-Station-13/upstream-merge-33584 
[MIRROR] Tiles blessed by holy water now block servant warp-in/Eminence snooping
 2017-12-25 21:27:17 -06:00
LetterJayandGitHub a0a6134d4d Merge pull request #4502 from Citadel-Station-13/upstream-merge-33724 
[MIRROR] re-implements issue template hiding and improves wording/structure
 2017-12-25 21:26:45 -06:00
CitadelStationBot b4763cb2be Automatic changelog generation for PR #4497 [ci skip] 2017-12-25 21:26:36 -06:00
LetterJayandGitHub 374ab40f4a Merge pull request #4497 from Citadel-Station-13/upstream-merge-33731 
[MIRROR] Tweaks the syndicate infiltrator so it's no longer lopsided.
 2017-12-25 21:26:34 -06:00
CitadelStationBot 8ed0838377 Automatic changelog generation for PR #4494 [ci skip] 2017-12-25 21:26:20 -06:00
LetterJayandGitHub 134201d185 Merge pull request #4494 from Citadel-Station-13/upstream-merge-32433 
[MIRROR] [READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
 2017-12-25 21:26:17 -06:00
Emmett GainesandCitadelStationBot 0a29f02c89 Blocks auxiliary bases from being placed on top of lava or indestructible turfs 2017-12-25 19:18:01 -06:00
Emmett GainesandCitadelStationBot 9ece43116d Makes cyclelinkeddir rotate with shuttle 2017-12-25 19:16:47 -06:00
CitadelStationBot b3005dd80f Modified the starting locations of advanced camera console eyes 2017-12-25 19:14:33 -06:00
CruixandCitadelStationBot 8465defbb0 Modified the starting locations of advanced camera console eyes (#33759) 
* Modified the starting locations of advanced camera console eyes
Made shuttle navigation computers no longer work on z levels they are not locked to

* Advanced camera eyes do not start on the console if they use static and the console is in camera view but not on a usable z-level
 2017-12-25 19:14:33 -06:00
CitadelStationBot c2489baae9 Arena shuttle teleport fix 2017-12-25 19:12:20 -06:00
Emmett GainesandCitadelStationBot a1ec5538a6 Arena shuttle teleport fix (#33777) 2017-12-25 19:12:20 -06:00
CitadelStationBot bec340d3bd Turns the baseturf var into a part time list 2017-12-25 19:11:07 -06:00
Emmett GainesandCitadelStationBot 9d0a4722e5 turns the baseturf var into a part time list (#33705) 2017-12-25 19:11:06 -06:00
CitadelStationBot 45e9c96136 Adds random seed feedback 2017-12-25 19:05:36 -06:00
Jordan BrownandCitadelStationBot 08b2224007 Adds random seed feedback (#33708) 
* Master now sets rand_seed

* Blackbox now records Master.random_seed
 2017-12-25 19:05:36 -06:00
coiaxandCitadelStationBot 703667bdff Ghosts can *spin and *flip 2017-12-25 17:11:29 -06:00
CitadelStationBot bf5e273414 gives medical some medical boards, but not their own circuit imprinter yet 2017-12-25 16:42:18 -06:00
kevinz000andCitadelStationBot b0f793f435 gives medical some medical boards, but not their own circuit imprinter yet (#33816) 
* medical gets med boards

* sleepers/cryo too
 2017-12-25 16:42:18 -06:00
LetterJayandGitHub 6205268f7e Merge pull request #4441 from Citadel-Station-13/upstream-merge-33661 
[MIRROR] [HIGH PRIORITY]Hotfix for the monkeylike disability
 2017-12-25 07:28:52 -06:00