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

12709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot be61d258b9 Automatic changelog generation for PR #5101 [ci skip] 2018-01-26 09:47:32 -06:00
deathride58 90611e16ed Merge pull request #5101 from Citadel-Station-13/upstream-merge-34873 
[MIRROR] Fixes Infinite Airlock Materials
 2018-01-26 15:47:29 +00:00
CitadelStationBot 26d070c56a Automatic changelog generation for PR #5090 [ci skip] 2018-01-26 09:44:25 -06:00
deathride58 8ee42a5282 Merge pull request #5090 from Citadel-Station-13/upstream-merge-34755 
[MIRROR] All color inputs use current color as default choice
 2018-01-26 15:44:23 +00:00
deathride58 4008898f54 Merge pull request #5054 from Citadel-Station-13/upstream-merge-34829 
[MIRROR] Removes animation from photos
 2018-01-26 15:39:38 +00:00
CitadelStationBot 52e6e51d30 Fixes Infinite Airlock Materials 2018-01-26 02:58:43 -06:00
uraniummeltdown cb8e239bd7 fixes not being able to weld mineral plating off of a mineral airlock turned into mineral airlock assembly 2018-01-26 02:58:43 -06:00
LetterJay 0c86312618 Merge pull request #5100 from Citadel-Station-13/upstream-merge-34860 
[MIRROR] Fixes double camera assemblies when deconstructing cameras
 2018-01-25 14:15:29 -06:00
LetterJay 1f5e9983bc Merge pull request #5099 from Citadel-Station-13/upstream-merge-34858 
[MIRROR] Adds hotspots to chasm blacklist
 2018-01-25 14:15:18 -06:00
LetterJay 7b06b12726 Merge pull request #5098 from Citadel-Station-13/upstream-merge-34859 
[MIRROR] Removes sulpheric acid requirement from express console circuits
 2018-01-25 14:15:06 -06:00
CitadelStationBot 9f620c9af8 Automatic changelog generation for PR #5038 [ci skip] 2018-01-25 13:41:05 -06:00
LetterJay 13c3c7b4e7 Merge pull request #5038 from Citadel-Station-13/upstream-merge-34466 
[MIRROR] Fake nuclear disks are even more convincing
 2018-01-25 13:41:02 -06:00
LetterJay 069972b3a0 map 2018-01-25 12:59:30 -06:00
CitadelStationBot 53d31967db Fixes double camera assemblies when deconstructing cameras 2018-01-25 05:11:07 -06:00
Leo 90bcf0ef84 Merge pull request #34860 from YPOQ/camerafix 
Fixes double camera assemblies when deconstructing cameras
 2018-01-25 05:11:07 -06:00
CitadelStationBot a3018a62f3 Adds hotspots to chasm blacklist 2018-01-25 05:10:59 -06:00
Jordan Brown 01f89292a2 Adds hotspots to chasm blacklist (#34858) 
* Adds hotspots to chasm blacklist

* Blacklists landmarks from chasms
 2018-01-25 05:10:59 -06:00
CitadelStationBot 5129615743 Removes sulpheric acid requirement from express console circuits 2018-01-25 05:09:41 -06:00
Leo 45c46f721e Merge pull request #34859 from tgstation/Cyberboss-patch-4 
Removes sulpheric acid requirement from express console circuits
 2018-01-25 05:09:41 -06:00
CitadelStationBot 21eb71b909 Automatic changelog generation for PR #5069 [ci skip] 2018-01-25 00:51:03 -06:00
LetterJay 9234d01b76 Merge pull request #5069 from Citadel-Station-13/upstream-merge-33773 
[MIRROR] [Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common
 2018-01-25 00:51:00 -06:00
LetterJay 6f74607460 Merge pull request #5097 from Citadel-Station-13/revert-5094-upstream-merge-34912 
Revert "[MIRROR] Forces test run to run with a set random seed"
 2018-01-25 00:35:58 -06:00
LetterJay 63bea9d1fc Revert "[MIRROR] Forces test run to run with a set random seed" 2018-01-25 00:17:33 -06:00
LetterJay b4a80a05b5 Merge pull request #5096 from Citadel-Station-13/revert-5084-upstream-merge-34894 
Revert "[MIRROR] Fix old usages of trait introduced by the trait merge"
 2018-01-24 23:15:16 -06:00
LetterJay 76fab4fccf Revert "[MIRROR] Fix old usages of trait introduced by the trait merge" 2018-01-24 23:14:51 -06:00
LetterJay 41adb46c2a fixes travis 2018-01-24 21:51:02 -06:00
CitadelStationBot 81af4a330c Automatic changelog generation for PR #5095 [ci skip] 2018-01-24 21:45:53 -06:00
LetterJay d73cd1d35f Merge pull request #5095 from Citadel-Station-13/upstream-merge-34752 
[MIRROR] Clown traitors can buy clown bombs now
 2018-01-24 21:45:51 -06:00
LetterJay 5c32347a9f Merge pull request #5094 from Citadel-Station-13/upstream-merge-34912 
[MIRROR] Forces test run to run with a set random seed
 2018-01-24 21:45:41 -06:00
LetterJay a090f2823d Merge pull request #5093 from Citadel-Station-13/upstream-merge-34827 
[MIRROR] Spawns a pen-uplink if you don't have one /w pen pref.
 2018-01-24 21:45:29 -06:00
CitadelStationBot ca47abdedb Automatic changelog generation for PR #5092 [ci skip] 2018-01-24 21:45:18 -06:00
LetterJay 50c3debdcf Merge pull request #5092 from Citadel-Station-13/upstream-merge-34383 
[MIRROR] You can now defib monkeys
 2018-01-24 21:45:16 -06:00
LetterJay 7fcce308b6 Merge pull request #5084 from Citadel-Station-13/upstream-merge-34894 
[MIRROR] Fix old usages of trait introduced by the trait merge
 2018-01-24 21:44:59 -06:00
CitadelStationBot 4b414fe8c7 Automatic changelog generation for PR #5091 [ci skip] 2018-01-24 21:44:23 -06:00
LetterJay 1dffa54809 Merge pull request #5091 from Citadel-Station-13/upstream-merge-34623 
[MIRROR] Makes templates able to use PlaceOnTop
 2018-01-24 21:44:21 -06:00
LetterJay cd17afba45 Update preferences.dm 2018-01-24 21:44:00 -06:00
LetterJay c30127d0d5 Merge pull request #5089 from Citadel-Station-13/upstream-merge-34841 
[MIRROR] Fixes derelict area issues
 2018-01-24 21:43:24 -06:00
LetterJay 0c43d1ef92 Merge pull request #5088 from Citadel-Station-13/upstream-merge-34838 
[MIRROR] Fixes poly's ghost SM spam
 2018-01-24 21:43:07 -06:00
LetterJay c2df8bbacc Merge pull request #5087 from Citadel-Station-13/upstream-merge-34848 
[MIRROR] Adds new landmark icons
 2018-01-24 21:42:12 -06:00
LetterJay eb7a4c005e Merge pull request #5086 from Citadel-Station-13/upstream-merge-34815 
[MIRROR] Adds snow baseturf editors to op base
 2018-01-24 21:41:57 -06:00
LetterJay 2c40834c5a Merge pull request #5085 from Citadel-Station-13/upstream-merge-34699 
[MIRROR] Rename /datum/config_entry/var/value to config_entry_value
 2018-01-24 21:41:33 -06:00
CitadelStationBot 189c846999 Clown traitors can buy clown bombs now 2018-01-24 21:23:37 -06:00
imsxz e9cdf72439 less than 100 2018-01-24 21:23:37 -06:00
LetterJay 7a8fbb08c6 Merge branch 'master' into upstream-merge-34894 2018-01-24 21:17:35 -06:00
LetterJay 8ea6f372ed Update medicine_reagents.dm 2018-01-24 20:50:21 -06:00
LetterJay 8c50fffdfb Merge pull request #5083 from Citadel-Station-13/upstream-merge-34895 
[MIRROR] #34889 Fixes possible issue with set_labels
 2018-01-24 20:49:44 -06:00
CitadelStationBot d531f63fa9 Automatic changelog generation for PR #5081 [ci skip] 2018-01-24 20:48:17 -06:00
LetterJay cf02adf419 Merge pull request #5081 from Citadel-Station-13/upstream-merge-34744 
[MIRROR] shuttles will now throw you if you don't buckle in
 2018-01-24 20:48:15 -06:00
CitadelStationBot a9bc274e9a Automatic changelog generation for PR #5080 [ci skip] 2018-01-24 20:48:05 -06:00
LetterJay b89007ade5 Merge pull request #5080 from Citadel-Station-13/upstream-merge-34746 
[MIRROR] Makes the autolathe repeat it's animation while it's still printing.
 2018-01-24 20:48:03 -06:00