kevinz000
21cfddd426
fixes healguardians not being able to heal people ( #31228 )
...
* Update guardian.dm
* Update support.dm
* Update guardian.dm
2017-10-03 17:48:50 -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
0b7ef4d90f
Merge pull request #3091 from Citadel-Station-13/upstream-merge-31233
...
[MIRROR] Fixes floating bullet holes
2017-10-03 12:31:59 -04:00
LetterJay
4637fcb75c
Merge pull request #3090 from Citadel-Station-13/upstream-merge-31231
...
[MIRROR] Fixes alt-click runtime
2017-10-03 12:30:37 -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
LetterJay
887e6799e0
Merge pull request #3087 from Citadel-Station-13/upstream-merge-31217
...
[MIRROR] makes /turf/Enter() faster, and also makes CollidedWith async
2017-10-03 12:29:30 -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
Leo
a64e2fd25e
Merge pull request #31233 from kevinz000/patch-306
...
Fixes floating bullet holes
2017-10-03 06:18:41 -05:00
Leo
cdfc5ffc0c
Merge pull request #31231 from AnturK/longenoughiruntimelogtopissmeoff
...
Fixes alt-click runtime
2017-10-03 06:18:33 -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
vuonojenmustaturska
ebca0173f3
makes /turf/Enter() faster, and also makes CollidedWith async ( #31217 )
...
* makes /turf/Enter faster, maybe
* waitfor false on atom/collidedwith
2017-10-03 04:33:23 -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
Michiyamenotehifunana
4e31a45154
Nerf to 10mm Soporific Bullets ( #3085 )
...
Makes it require 3 shots instead of just 2 to put your victim to sleep.
2017-10-03 02:18:42 -07:00
LetterJay
ef671d8764
OOOOOOOH SHIIIIIIIIIIT
2017-10-03 03:55:05 -05:00
LetterJay
3a90891019
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-10-03 03:42:26 -05:00
LetterJay
b95d35d56d
FUCK.
2017-10-03 03:42:13 -05:00
LetterJay
c8c5af25fe
Update custom_items.dm
2017-10-03 03:31:49 -05: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
CitadelStationBot
99d57a7f19
[MIRROR] Swarmers work with multiz stations ( #3083 )
...
* Merge pull request #31225 from KorPhaeron/multiz_swarmers
Swarmers work with multiz stations
* Swarmers work with multiz stations
2017-10-02 23:20:37 -07:00
Augustfox
3e6ceaa9a2
Revert "Organize hair and facial hair in character creation" ( #3084 )
2017-10-02 23:16:51 -07:00
LetterJay
c8f52d272e
donation item
2017-10-03 00:18:21 -05:00
LetterJay
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
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
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
LetterJay
08b9a11536
Update retaliate.dm
2017-10-02 17:32:54 -05:00
LetterJay
b19f88c2dc
Update mineral_doors.dm
2017-10-02 17:32:42 -05:00
LetterJay
a9116b3648
Update portals.dm
2017-10-02 17:32:27 -05:00
LetterJay
865f057d7b
Update mecha_control_console.dm
2017-10-02 17:32:11 -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
LetterJay
891f89e49a
Update custom_items.dm
2017-10-02 15:34:36 -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
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
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
06b30d3e73
[MIRROR] Fixes krav maga working while stunned
...
closes #3073
2017-10-01 22:52:58 -05:00
LetterJay
684d888366
Update playsound.dm
2017-10-01 22:51:34 -05:00
LetterJay
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
