shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,130 Commits 5 Branches 0 Tags
2ec77d2d9b79052ee59c0990fa5a1eec0afbd2dd
Commit Graph

2580 Commits

Author SHA1 Message Date
oranges
2ec77d2d9b Merge pull request #31237 from Cyberboss/STAPIUpdate 
Server tools API update to 3.1.0.1
 2017-10-03 18:47:51 -05:00
LetterJay
05f5ee73ce Merge pull request #2922 from Daniel0Mclovin/Kris's-Garbage 
Podpeople available as roundstart ft. minor stat changes
 2017-10-03 15:22:43 -04:00
LetterJay
159924f42b Merge pull request #3092 from Citadel-Station-13/upstream-merge-31210 
[MIRROR] Silicons can no longer take brain damage
 2017-10-03 12:32:19 -04:00
LetterJay
c596539fbf Merge pull request #3089 from Citadel-Station-13/upstream-merge-31219 
[MIRROR] Makes antimatter code less shit
 2017-10-03 12:30:02 -04:00
LetterJay
660e9fea9c Merge pull request #3088 from Citadel-Station-13/upstream-merge-30846 
[MIRROR] Fixes/tweaks wormholes event and portals
 2017-10-03 12:29:46 -04:00
Leo
0888d3944e Merge pull request #31210 from MoreRobustThanYou/patch-7 
Silicons can no longer take brain damage
 2017-10-03 06:20:51 -05:00
MoreRobustThanYou
f870b66b31 Makes antimatter code less shit (#31219) 
* Antimatter shielding that can't find a control unit won't delete itself anymore

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* Update shielding.dm

* gthruhru

* thanks Antur
 2017-10-03 04:40:47 -05:00
kevinz000
3b3b45c03c Fixes/tweaks wormholes event and portals (#30846) 
* fix

* THERE WE GO

* Update portals.dm
 2017-10-03 04:37:35 -05:00
Michiyamenotehifunana
8ac574108e Brings 10mm Soporific Description in-line with its nerfed stats 
D'oh. Completely forgot about this. Now no one can complain that their rape gun instructions tell them 2 shots is enough when 3 is what you actually need.
 2017-10-03 17:24:36 +08:00
John
42cfb61f42 Edited regen 
Made it proper
 2017-10-03 01:55:50 -05:00
John
221404bffb cleaned up some things 2017-10-03 01:42:18 -05:00
CitadelStationBot
dffcebf4ff [MIRROR] Remove ash drake hide from lesser ash drakes butcher loot (#2938) 
* Merge pull request #30884 from Arianya/patch-1

Remove ash drake hide from lesser ash drakes butcher loot

* Remove ash drake hide from lesser ash drakes butcher loot
 2017-10-02 23:20:55 -07:00
CitadelStationBot
1e309deac0 [MIRROR] Wizard can't cast shout or whisper spells when he is unable to speak (#2965) 
* Wizard being mute now blocks touch attacks from activating (can still be cast)

* Wizard can't cast shout or whisper spells when he is unable to speak
 2017-10-02 23:20:46 -07:00
Augustfox
3e6ceaa9a2 Revert "Organize hair and facial hair in character creation" (#3084) 2017-10-02 23:16:51 -07:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
2c219ba814 Merge pull request #3077 from Citadel-Station-13/upstream-merge-31192 
[MIRROR] ismecha define
 2017-10-02 21:11:59 -04:00
LetterJay
08b9a11536 Update retaliate.dm 2017-10-02 17:32:54 -05:00
oranges
139ebadc52 Merge pull request #31196 from kevinz000/patch-303 
Fixes check antagonists for blood brothers
 2017-10-02 15:52:10 -05:00
ShizCalev
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
LetterJay
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
LetterJay
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 Brown
bd76e658b0 Makes the reply link for ahelps use the global token (#31191) 2017-10-02 01:14:14 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
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
LetterJay
684d888366 Update playsound.dm 2017-10-01 22:51:34 -05:00
LetterJay
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
LetterJay
021b0a2bee Update growninedible.dm 2017-10-01 22:38:55 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
oranges
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
LetterJay
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
JJRcop
7c88f10db0 played_url now includes ckey 2017-10-01 19:30:43 -05:00
Daniel0Mclovin
d4321ac0b5 Accidentally put a comma 2017-10-01 17:26:45 -05:00
Daniel0Mclovin
2d835e1d73 Nerfed overall healing 
dialed down to 0.7
 2017-10-01 17:25:20 -05:00
Daniel0Mclovin
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
LetterJay
64ced3f6f4 Merge pull request #3061 from Citadel-Station-13/upstream-merge-31114 
[MIRROR] Fixes space vision
 2017-10-01 16:56:24 -04:00
oranges
e2dd424fb0 Revert "Prompt for observer confirmation now happens when you click it initially" 2017-10-01 15:50:27 -05:00
LetterJay
353739071f Update lib_items.dm 2017-10-01 15:46:53 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
3d2b5e99c9 Merge pull request #3039 from Citadel-Station-13/upstream-merge-31143 
[MIRROR] adds a space
 2017-10-01 16:29:35 -04:00
LetterJay
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
LetterJay
676abb946c Update halloween.dm 2017-10-01 15:26:56 -05:00
LetterJay
f1f99fc26c Update electrical_storm.dm 2017-10-01 15:26:32 -05:00