shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,335 Commits 5 Branches 0 Tags
4fc286289e2deb870c729aa2ede06fdc216e3ff3
Commit Graph
4485 Commits
Author SHA1 Message Date
LetterJayandGitHub f03df4f7bb Merge pull request #3082 from ktccd/fixes_flavor_text_and_changeling_dicks 
Fixes flavor_text and changeling genitals
 2017-10-02 21:26:15 -04:00
LetterJayandGitHub 3c0a9c23e1 Merge pull request #3081 from Citadel-Station-13/upstream-merge-31196 
[MIRROR] Fixes check antagonists for blood brothers
 2017-10-02 21:12:40 -04:00
LetterJayandGitHub 9026f029d5 Merge pull request #3079 from Citadel-Station-13/upstream-merge-31103 
[MIRROR] Refactor quick create antag panel code, fixed AFK revs not properly ending the round.
 2017-10-02 21:12:31 -04:00
LetterJayandGitHub 4d68cd0803 Merge pull request #3078 from Citadel-Station-13/upstream-merge-31191 
[MIRROR] Makes the reply link for ahelps use the global token
 2017-10-02 21:12:17 -04:00
LetterJayandGitHub 2c219ba814 Merge pull request #3077 from Citadel-Station-13/upstream-merge-31192 
[MIRROR] ismecha define
 2017-10-02 21:11:59 -04:00
LetterJayandGitHub 39ef613076 Update screen_objects.dm 2017-10-02 19:37:03 -05:00
ktccd 3a72023532 Fixes flavor_text and changeling genitals 
flavor_text is now, again, set from DNA once cloned/podded/whatever.
Changelings should do the same, and also get appropriate genitals.
Thanks TG, for overwriting this code. But really, thanks Byond, for
making extending this functionality so fucking hard.
 2017-10-03 02:25:53 +02:00
LetterJayandGitHub 08b9a11536 Update retaliate.dm 2017-10-02 17:32:54 -05:00
LetterJayandGitHub b19f88c2dc Update mineral_doors.dm 2017-10-02 17:32:42 -05:00
LetterJayandGitHub a9116b3648 Update portals.dm 2017-10-02 17:32:27 -05:00
LetterJayandGitHub 865f057d7b Update mecha_control_console.dm 2017-10-02 17:32:11 -05:00
orangesandCitadelStationBot 139ebadc52 Merge pull request #31196 from kevinz000/patch-303 
Fixes check antagonists for blood brothers
 2017-10-02 15:52:10 -05:00
LetterJayandGitHub 891f89e49a Update custom_items.dm 2017-10-02 15:34:36 -05:00
ShizCalevandCitadelStationBot e402c4350c Refactor quick create antag panel code, fixed AFK revs not properly ending the round. (#31103) 
* Refactor quick create antag, fixed AFK revs not ending

* More cleanup

* Simplified one of the checks
The other half was covered by considered_alive already.

* Reordered check

Eliminate current antags sooner before running them through the rest of
the checks.

* removed switch
 2017-10-02 02:48:51 -05:00
LetterJayandGitHub 52369cdb7c Merge pull request #3075 from Citadel-Station-13/ManualMirror 
[MIRROR] Fixes krav maga working while stunned
 2017-10-02 02:31:47 -04:00
LetterJayandGitHub 87690e3bb7 Merge pull request #3072 from Citadel-Station-13/upstream-merge-31186 
[MIRROR] played_url now includes ckey
 2017-10-02 02:31:39 -04:00
LetterJayandGitHub 313196b42f Merge pull request #3062 from Citadel-Station-13/upstream-merge-31201 
[MIRROR] Fixes grown runtime spam
 2017-10-02 02:31:32 -04:00
Jordan BrownandCitadelStationBot bd76e658b0 Makes the reply link for ahelps use the global token (#31191) 2017-10-02 01:14:14 -05:00
KorPhaeronandCitadelStationBot 3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJayandGitHub cc93f1e546 Merge pull request #3074 from Citadel-Station-13/upstream-merge-31127 
[MIRROR] Chat command to notify admins when the round ends
 2017-10-01 23:53:41 -04:00
LetterJayandGitHub 06b30d3e73 [MIRROR] Fixes krav maga working while stunned 
closes #3073
 2017-10-01 22:52:58 -05:00
LetterJayandGitHub 684d888366 Update playsound.dm 2017-10-01 22:51:34 -05:00
LetterJayandGitHub acf08df884 Merge pull request #3071 from Citadel-Station-13/upstream-merge-31190 
[MIRROR] Fixes Vanguard never stunning for more than 2 seconds
 2017-10-01 23:40:49 -04:00
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 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
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 021b0a2bee Update growninedible.dm 2017-10-01 22:38:55 -05: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
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 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
orangesandCitadelStationBot b9f71e9e15 Merge pull request #31127 from Cyberboss/notify_command 
Chat command to notify admins when the round ends
 2017-10-01 21:12:41 -05: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
JJRcopandCitadelStationBot 7c88f10db0 played_url now includes ckey 2017-10-01 19:30:43 -05:00
Joan LungandCitadelStationBot 02987715b0 Fixes Vanguard never stunning for more than 2 seconds 2017-10-01 19:29:34 -05:00
Daniel0MclovinandGitHub d4321ac0b5 Accidentally put a comma 2017-10-01 17:26:45 -05:00
Daniel0MclovinandGitHub 2d835e1d73 Nerfed overall healing 
dialed down to 0.7
 2017-10-01 17:25:20 -05:00
Daniel0MclovinandGitHub d3ae434b56 Changed a few stats 
Darkness now does oxy damage and slight toxin, added a bit more heat mod, no longer heals toxin damage, oxygen loss healing nerfed. Can eat in the dark to try to combat starvation, added slight toxin damage to make it harder to stay in the dark with a shit ton of food.
 2017-10-01 17:20:44 -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
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
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
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