shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,046 Commits 5 Branches 0 Tags
6268682ee3cabe050ea7bd7a076a88f9dfe69754
Commit Graph
6046 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 6268682ee3 Merge pull request #3069 from Citadel-Station-13/upstream-merge-31185 
[MIRROR] Fixes gen scanner timer
 2017-10-01 23:40:35 -04:00
LetterJayandGitHub 872358ecca Merge pull request #3066 from Citadel-Station-13/upstream-merge-31172 
[MIRROR] Maplist is loaded regardless of maprotation config setting
 2017-10-01 23:40:23 -04:00
LetterJayandGitHub ac6cbbfbe7 Merge pull request #3065 from Citadel-Station-13/upstream-merge-31173 
[MIRROR] Edits to code/controllers/configuration/entries autotag Config Update
 2017-10-01 23:40:01 -04:00
LetterJayandGitHub a921dcd568 Merge pull request #3064 from Citadel-Station-13/upstream-merge-31177 
[MIRROR] Ashwalker tendrils now drop everything on victims before consuming
 2017-10-01 23:39:48 -04:00
CitadelStationBot 8101b1e67f Automatic changelog generation for PR #3063 [ci skip] 2017-10-01 22:39:42 -05:00
LetterJayandGitHub ea493d3f3d Merge pull request #3063 from Citadel-Station-13/upstream-merge-31175 
[MIRROR] Fixes viruses not calling Start on their symptoms when spreading
 2017-10-01 23:39:41 -04:00
LetterJayandGitHub 2cafd6fefb Merge pull request #3060 from Citadel-Station-13/upstream-merge-31086 
[MIRROR] Adds desc to things lacking them.
 2017-10-01 23:37:35 -04:00
CitadelStationBot 85639dda35 Automatic changelog generation for PR #3056 [ci skip] 2017-10-01 22:37:28 -05:00
LetterJayandGitHub fc89d769f0 Merge pull request #3056 from Citadel-Station-13/upstream-merge-31130 
[MIRROR] Adds the Cargo-Tech-of-the-Shift award
 2017-10-01 23:37:26 -04:00
LetterJayandGitHub cec44fa601 Merge pull request #3055 from Citadel-Station-13/upstream-merge-31151 
[MIRROR] Removes random junk from Metastation evidence closets
 2017-10-01 23:37:18 -04:00
LetterJayandGitHub a468f609d8 Merge pull request #3054 from Citadel-Station-13/upstream-merge-31163 
[MIRROR] Fixes recyclers removing brainmobs from holders, removes direct loc setting and src.loc in playsound too
 2017-10-01 23:37:09 -04:00
LetterJayandGitHub cc8f494f1f Merge pull request #3036 from Citadel-Station-13/upstream-merge-31129 
[MIRROR] Cleans up some antag/event landmark checks
 2017-10-01 23:36:48 -04:00
LetterJayandGitHub 05022208e3 Merge pull request #3067 from Citadel-Station-13/upstream-merge-31213 
[MIRROR] Revert "Prompt for observer confirmation now happens when you click it initially"
 2017-10-01 20:48:09 -04:00
CitadelStationBot e5e9a85191 Fixes gen scanner timer 2017-10-01 17:03:52 -05:00
ShizCalevandCitadelStationBot d9c77f628d Fixes gen scanner timer 2017-10-01 17:03:52 -05:00
LetterJayandGitHub 64ced3f6f4 Merge pull request #3061 from Citadel-Station-13/upstream-merge-31114 
[MIRROR] Fixes space vision
 2017-10-01 16:56:24 -04:00
LetterJayandGitHub 1ecebee19d Merge pull request #3057 from Citadel-Station-13/upstream-merge-31171 
[MIRROR] Lastest
 2017-10-01 16:55:54 -04:00
CitadelStationBot 16e47ee789 Automatic changelog generation for PR #3059 [ci skip] 2017-10-01 15:55:19 -05:00
LetterJayandGitHub 39741c4706 Merge pull request #3059 from Citadel-Station-13/upstream-merge-31082 
[MIRROR] Repairs and Intensifies Secret Satchels
 2017-10-01 16:55:18 -04:00
CitadelStationBot e54e4c3cd9 Revert "Prompt for observer confirmation now happens when you click it initially" 2017-10-01 15:50:27 -05:00
orangesandCitadelStationBot e2dd424fb0 Revert "Prompt for observer confirmation now happens when you click it initially" 2017-10-01 15:50:27 -05:00
LetterJayandGitHub 353739071f Update lib_items.dm 2017-10-01 15:46:53 -05:00
LetterJayandGitHub 76d6402a9d Update windoor_assembly.dm 2017-10-01 15:46:31 -05:00
LetterJayandGitHub 4a4ecdf211 Update transit_tube_construction.dm 2017-10-01 15:46:20 -05:00
LetterJayandGitHub 0480bebc8b Merge pull request #3058 from Citadel-Station-13/upstream-merge-31167 
[MIRROR] Prompt for observer confirmation now happens when you click it initially
 2017-10-01 16:38:27 -04:00
LetterJayandGitHub 1c00a8ba29 Update recycler.dm 2017-10-01 15:38:09 -05:00
CitadelStationBot 0df550542d Automatic changelog generation for PR #3053 [ci skip] 2017-10-01 15:37:32 -05:00
LetterJayandGitHub 77bdebd020 Merge pull request #3053 from Citadel-Station-13/upstream-merge-31155 
[MIRROR] Fixes station name in cargo stock displays
 2017-10-01 16:37:31 -04:00
LetterJayandGitHub cef0d9ef68 Merge pull request #3052 from Citadel-Station-13/upstream-merge-31165 
[MIRROR] fixes delete hotkey triggering messages when the user isn't even a living mob
 2017-10-01 16:35:53 -04:00
LetterJayandGitHub f3ae038f6c Update cargo.dm 2017-10-01 15:35:27 -05:00
LetterJayandGitHub 5b81614e87 Merge pull request #3051 from Citadel-Station-13/upstream-merge-31200 
[MIRROR] Fixes warning spam
 2017-10-01 16:32:46 -04:00
LetterJayandGitHub 018300507a Merge pull request #3050 from Citadel-Station-13/upstream-merge-31162 
[MIRROR] Fixes plasma cutters only hitting one tile
 2017-10-01 16:32:24 -04:00
LetterJayandGitHub 0e50bc7884 Merge pull request #3049 from Citadel-Station-13/upstream-merge-31203 
[MIRROR] Fixes paper writing
 2017-10-01 16:32:12 -04:00
LetterJayandGitHub c8647565fc Merge pull request #3048 from Citadel-Station-13/upstream-merge-31157 
[MIRROR] Fixes events with sleeps.
 2017-10-01 16:32:00 -04:00
LetterJayandGitHub f538d91fe8 Merge pull request #3047 from Citadel-Station-13/upstream-merge-31145 
[MIRROR] Fixes aliums being able to attack the SM crystal
 2017-10-01 16:31:44 -04:00
CitadelStationBot 1d3f476b2c Automatic changelog generation for PR #3042 [ci skip] 2017-10-01 15:30:41 -05:00
LetterJayandGitHub f0379ec3f3 Merge pull request #3042 from Citadel-Station-13/upstream-merge-30605 
[MIRROR] You can now examine an airlock to find out how to construct/deconstruct it
 2017-10-01 16:30:40 -04:00
LetterJayandGitHub 3d2b5e99c9 Merge pull request #3039 from Citadel-Station-13/upstream-merge-31143 
[MIRROR] adds a space
 2017-10-01 16:29:35 -04:00
LetterJayandGitHub 8b0b4f9e2a Merge pull request #3038 from Citadel-Station-13/upstream-merge-31132 
[MIRROR] Fixes changelings being able to transform sting mobs that are transform sting immune
 2017-10-01 16:29:13 -04:00
LetterJayandGitHub 2d8e3b301f Merge pull request #3037 from Citadel-Station-13/upstream-merge-31128 
[MIRROR] Removes irccheck admin restriction
 2017-10-01 16:29:04 -04:00
CitadelStationBot 18fbfd7a2d Maplist is loaded regardless of maprotation config setting 2017-10-01 15:27:51 -05:00
Jordan BrownandCitadelStationBot 4d610b95bd Maplist is loaded regardless of maprotation config setting (#31172) 
* Uncomments map rotation in default config

* Maplist is loaded regardless of maprotation config setting

Also logs loading of the map file
 2017-10-01 15:27:51 -05:00
LetterJayandGitHub 676abb946c Update halloween.dm 2017-10-01 15:26:56 -05:00
LetterJayandGitHub f1f99fc26c Update electrical_storm.dm 2017-10-01 15:26:32 -05:00
LetterJayandGitHub 00aa312610 Update carp_migration.dm 2017-10-01 15:26:15 -05:00
CitadelStationBot 8531fa95b6 Edits to code/controllers/configuration/entries autotag Config Update 2017-10-01 15:25:40 -05:00
orangesandCitadelStationBot fef5c53791 Merge pull request #31173 from tgstation/Cyberboss-patch-3 
Edits to code/controllers/configuration/entries autotag Config Update
 2017-10-01 15:25:40 -05:00
CitadelStationBot 16f48d2df5 Ashwalker tendrils now drop everything on victims before consuming 2017-10-01 15:22:26 -05:00
kevinz000andCitadelStationBot 4274a875db Ashwalker tendrils now drop everything on victims before consuming (#31177) 
* Update ash_walker_den.dm

* Update ash_walker_den.dm
 2017-10-01 15:22:26 -05:00
CitadelStationBot bdbe19014a Fixes viruses not calling Start on their symptoms when spreading 2017-10-01 15:22:19 -05:00