From 30a09bf66ac923cf218422b5d514ce1000cb078f Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Wed, 16 May 2012 23:33:12 -0700 Subject: [PATCH 1/3] Metal foam now blocks air. --- code/defines/obj.dm | 8 ++++---- code/game/objects/effect_system.dm | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 8b8bcc63adb..06c6295f442 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -88,7 +88,7 @@ /obj/structure/bedsheetbin name = "linen bin" - desc = "A bin for containing bedsheets. It looks rather cosy." + desc = "A small wire mesh bin full of extra bedsheets and cleaning supplies for the beds. Smells of lilacs and has a faint undertone of disinfectant." icon = 'items.dmi' icon_state = "bedbin" var/amount = 23.0 @@ -232,7 +232,7 @@ var/mob/living/carbon/monkey/target = null /obj/effect/sign/securearea - desc = "A warning sign which reads 'SECURE AREA'" + desc = "A large yellow warning sign which reads 'SECURE AREA', it appears to have been painted onto the wall like that." name = "SECURE AREA" icon = 'decals.dmi' icon_state = "securearea" @@ -250,7 +250,7 @@ density = 0 /obj/effect/sign/biohazard - desc = "A warning sign which reads 'BIOHAZARD'" + desc = "A warning sign which reads 'BIOHAZARD', you think it'd be a good idea to ensure you have a properly sealed hazardsuit on." name = "BIOHAZARD" icon = 'decals.dmi' icon_state = "bio" @@ -259,7 +259,7 @@ density = 0 /obj/effect/sign/electricshock - desc = "A warning sign which reads 'HIGH VOLTAGE'" + desc = "A warning sign which reads 'HIGH VOLTAGE', it looks like it'd be a wise decision to stay away from here." name = "HIGH VOLTAGE" icon = 'decals.dmi' icon_state = "shock" diff --git a/code/game/objects/effect_system.dm b/code/game/objects/effect_system.dm index 473a33c1e6c..c661ae8a725 100644 --- a/code/game/objects/effect_system.dm +++ b/code/game/objects/effect_system.dm @@ -1034,7 +1034,8 @@ steam.start() -- spawns the effect user << "\blue You hit the metal foam to no effect." CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0) - if(air_group) return 0 + if(!istype(mover)) + return 0 return !density From b9493129cf2bce1c864a48f3989a24868262d753 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Wed, 16 May 2012 23:47:22 -0700 Subject: [PATCH 2/3] Fixes the bullshit ERP crap form tg causing runtimes. Whoever coded that needs [REDACTED] --- code/modules/mob/living/living.dm | 14 +++++++------- code/modules/mob/mob_defines.dm | 4 ---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 3e1ea272e47..aa829b0930e 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -3,10 +3,10 @@ ..() // While I'm doing a terriblly lazy way of initalizing things, why don't I make it so people's preferences tag along with them. This could be useful in fixing the fucking cloned-as-unknown thing, making me not have to dynamically load them during tensioner, and of course, storing metadata. - - if(!src.storedpreferences) - src.storedpreferences = new - storedpreferences.savefile_load(src, 0) +//Whoever wrote this should go suck a choad. This was causing runtimes, asshat. IN ADDITION, YOU PUT IT IN THE LIFE PROC YOU ASSHAT +// if(!src.storedpreferences) +// src.storedpreferences = new +// storedpreferences.savefile_load(src, 0) @@ -281,8 +281,8 @@ density = 1 else density = !lying - - +//Bullshit ERP horseshit causing runtimes. Eat a dick. +/* /mob/living/proc/Examine_OOC() set name = "Examine Meta-Info (OOC)" set category = "OOC" @@ -300,7 +300,7 @@ else usr << "OOC Metadata is not supported by this server!" - return + return*/ /mob/living/attack_animal(mob/M) attack_paw(M) // treat it like a normal non-human attack diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index a7d4ec9ac9c..90770bf8af5 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -290,8 +290,4 @@ the mob is also allowed to move without any sort of restriction. For instance, i var/grav_delay = 0 var/being_strangled = 0 - var/datum/preferences/storedpreferences = null - -// var/geaslist = list() - From eb87f26079e3cec3f1d99d96690f06e3ef76f97c Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Wed, 16 May 2012 23:55:09 -0700 Subject: [PATCH 3/3] I removed that var a month ago! --- code/modules/mob/mob_defines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 90770bf8af5..f23dc12c89b 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -285,7 +285,7 @@ the mob is also allowed to move without any sort of restriction. For instance, i var/digitalcamo = 0 // Can they be tracked by the AI? var/list/organs = list( ) //List of organs. - var/list/organs2 = list() +// var/list/organs2 = list() //Singularity wants you! var/grav_delay = 0 var/being_strangled = 0