cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-21 23:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some runtimes (#2755)

Browse Source
This commit is contained in:
skull132
2017-06-18 13:48:24 +03:00
committed by GitHub
parent 521705dc62
commit 324dba97dc
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/changeling/changeling_items.dm
View File

@@ -27,7 +27,6 @@
/obj/item/weapon/melee/arm_blade/dropped() /obj/item/weapon/melee/arm_blade/dropped()
visible_message("<span class='danger'>With a sickening crunch, [user] reforms their arm blade into an arm!</span>", visible_message("<span class='danger'>With a sickening crunch, [user] reforms their arm blade into an arm!</span>",
"<span class='notice'>We assimilate the weapon back into our body.</span>",
"<span class='warning'>You hear organic matter ripping and tearing!</span>") "<span class='warning'>You hear organic matter ripping and tearing!</span>")
playsound(loc, 'sound/effects/blobattack.ogg', 30, 1) playsound(loc, 'sound/effects/blobattack.ogg', 30, 1)
QDEL_IN(src, 1) QDEL_IN(src, 1)
@@ -72,7 +71,6 @@
/obj/item/weapon/shield/riot/changeling/dropped() /obj/item/weapon/shield/riot/changeling/dropped()
visible_message("<span class='danger'>With a sickening crunch, [user] reforms their arm blade into an arm!</span>", visible_message("<span class='danger'>With a sickening crunch, [user] reforms their arm blade into an arm!</span>",
"<span class='notice'>We assimilate the weapon back into our body.</span>",
"<span class='warning'>You hear organic matter ripping and tearing!</span>") "<span class='warning'>You hear organic matter ripping and tearing!</span>")
playsound(loc, 'sound/effects/blobattack.ogg', 30, 1) playsound(loc, 'sound/effects/blobattack.ogg', 30, 1)
QDEL_IN(src, 1) QDEL_IN(src, 1)

5
code/modules/client/preferences.dm
View File

@@ -139,7 +139,7 @@ datum/preferences
var/savefile/loaded_preferences var/savefile/loaded_preferences
var/savefile/loaded_character var/savefile/loaded_character
var/datum/category_collection/player_setup_collection/player_setup var/datum/category_collection/player_setup_collection/player_setup
var/dress_mob = TRUE var/dress_mob = TRUE
/datum/preferences/New(client/C) /datum/preferences/New(client/C)
@@ -394,7 +394,8 @@ datum/preferences
for(var/N in character.organs_by_name) for(var/N in character.organs_by_name)
var/obj/item/organ/external/O = character.organs_by_name[N] var/obj/item/organ/external/O = character.organs_by_name[N]
O.markings.Cut() if (O)
O.markings.Cut()
for(var/M in body_markings) for(var/M in body_markings)
var/datum/sprite_accessory/marking/mark_datum = body_marking_styles_list[M] var/datum/sprite_accessory/marking/mark_datum = body_marking_styles_list[M]

2
code/modules/events/spider_infestation.dm
View File

@@ -24,7 +24,7 @@
while(spawncount && vents.len) while(spawncount && vents.len)
var/obj/vent = pick(vents) var/obj/vent = pick(vents)
new /obj/effect/spider/spiderling(vent.loc, spawns = possible_spiders) new /obj/effect/spider/spiderling(vent.loc, null, 1, possible_spiders)
vents -= vent vents -= vent
spawncount-- spawncount--

6
code/modules/multiz/turf.dm
View File

@@ -114,7 +114,11 @@
*/ */
/turf/simulated/open/proc/update() /turf/simulated/open/proc/update()
below = GetBelow(src) below = GetBelow(src)
below.above = src
// Edge case for when an open turf is above space on the lowest level.
if (below)
below.above = src
levelupdate() levelupdate()
for (var/atom/movable/A in src) for (var/atom/movable/A in src)
ADD_FALLING_ATOM(A) ADD_FALLING_ATOM(A)

4
code/modules/reagents/Chemistry-Reagents.dm
View File

@@ -34,6 +34,10 @@
var/color_weight = 1 var/color_weight = 1
/datum/reagent/proc/remove_self(var/amount) // Shortcut /datum/reagent/proc/remove_self(var/amount) // Shortcut
if (!holder)
PROCLOG_WEIRD("Null holder found. Name: [name], id: [id]")
return
holder.remove_reagent(id, amount) holder.remove_reagent(id, amount)
// This doesn't apply to skin contact - this is for, e.g. extinguishers and sprays. The difference is that reagent is not directly on the mob's skin - it might just be on their clothing. // This doesn't apply to skin contact - this is for, e.g. extinguishers and sprays. The difference is that reagent is not directly on the mob's skin - it might just be on their clothing.