diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm index 4ae72ea87c7..665a005b99c 100644 --- a/code/modules/client/client defines.dm +++ b/code/modules/client/client defines.dm @@ -17,6 +17,7 @@ var/moving = null var/adminobs = null var/area = null + var/time_died_as_mouse = 0 var/adminhelped = 0 diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 1e6822624e6..6a54b88666d 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -17,7 +17,6 @@ while sprite_sheets should be used for "flexible" clothing items that do not need to be refitted (e.g. vox wearing jumpsuits). */ var/list/sprite_sheets_refit = null - var/gunshot_residue //Updates the icons of the mob wearing the clothing item, if any. /obj/item/clothing/proc/update_clothing_icon() diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index e702dd422c3..54d84ab90b4 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -51,9 +51,6 @@ var/hurt_temperature = T0C-50 // slime keeps taking damage when its bodytemperature is below this var/die_temperature = 50 // slime dies instantly when its bodytemperature is below this - var/hurt_temperature = T0C-50 // slime keeps taking damage when its bodytemperature is below this - var/die_temperature = 50 // slime dies instantly when its bodytemperature is below this - ///////////TIME FOR SUBSPECIES var/colour = "grey" diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm index 14eb5569590..a8c089e1e40 100644 --- a/code/modules/telesci/bscrystal.dm +++ b/code/modules/telesci/bscrystal.dm @@ -18,7 +18,7 @@ /obj/item/bluespace_crystal/attack_self(mob/user) user.visible_message("[user] crushes [src]!", "You crush [src]!") - PoolOrNew(/obj/effect/effect/sparks, loc) + PoolOrNew(/obj/effect/sparks, loc) playsound(src.loc, "sparks", 50, 1) blink_mob(user) user.unEquip(src) @@ -31,7 +31,7 @@ if(!..()) // not caught in mid-air visible_message("[src] fizzles and disappears upon impact!") var/turf/T = get_turf(hit_atom) - PoolOrNew(/obj/effect/effect/sparks, T) + PoolOrNew(/obj/effect/sparks, T) playsound(src.loc, "sparks", 50, 1) if(isliving(hit_atom)) blink_mob(hit_atom) @@ -43,4 +43,4 @@ name = "artificial bluespace crystal" desc = "An artificially made bluespace crystal, it looks delicate." origin_tech = "bluespace=2" - blink_range = 4 // Not as good as the organic stuff! \ No newline at end of file + blink_range = 4 // Not as good as the organic stuff!