From 2cf38f00d2129dbe283b255207e1039fdf3a6c96 Mon Sep 17 00:00:00 2001 From: "LastBattaWolf@hotmail.com" Date: Thu, 8 Sep 2011 06:17:25 +0000 Subject: [PATCH] - Suicide is now visible on examine. Since I am terribad at coding, I made it so it checks for the suiciding var, which is usually reset once you finish dying to allow for suiciding again if you're cloned, but now it will instead reset when you are cloned. - Fixed a bug I made re: examining oxygen tanks. - Made chemsprayers large instead of small. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2155 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/virus2/Disease2/base.dm | 2 +- code/defines/obj/weapon.dm | 2 +- code/game/machinery/cloning.dm | 1 + code/game/objects/tank.dm | 3 +++ code/game/verbs/suicide.dm | 8 ++------ code/modules/mob/living/carbon/human/examine.dm | 8 ++++++++ 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/code/WorkInProgress/virus2/Disease2/base.dm b/code/WorkInProgress/virus2/Disease2/base.dm index c812405adf..eaf9263327 100644 --- a/code/WorkInProgress/virus2/Disease2/base.dm +++ b/code/WorkInProgress/virus2/Disease2/base.dm @@ -287,7 +287,7 @@ activate(var/mob/living/carbon/mob,var/multiplier) mob.suiciding = 1 //instead of killing them instantly, just put them at -175 health and let 'em gasp for a while - viewers(mob) << "\red [mob.name] is holding \his breath. It looks like \he's trying to commit suicide." + viewers(mob) << "\red [mob.name] is attempting to bite off \his tongue. It looks like \he's trying to commit suicide." mob.oxyloss = max(175 - mob.toxloss - mob.fireloss - mob.bruteloss, mob.oxyloss) mob.updatehealth() spawn(200) //in case they get revived by cryo chamber or something stupid like that, let them suicide again in 20 seconds diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 06480e97fe..d66735a4e0 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -516,7 +516,7 @@ item_state = "chemsprayer" flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY throwforce = 3 - w_class = 2.0 + w_class = 3.0 throw_speed = 2 throw_range = 10 origin_tech = "combat=3;materials=3;engineering=3" diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 1e20435d04..c87577b5d6 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -517,6 +517,7 @@ src.occupant:update_face() src.occupant:update_body() src.occupant:mutantrace = mrace + src.occupant:suiciding = 0 src.attempting = 0 return 1 diff --git a/code/game/objects/tank.dm b/code/game/objects/tank.dm index 159f886601..7abe4a3a18 100644 --- a/code/game/objects/tank.dm +++ b/code/game/objects/tank.dm @@ -63,6 +63,7 @@ /obj/item/weapon/tank/oxygen/examine() set src in usr + ..() if(air_contents.oxygen < 10) usr << text("\red The meter on the tank indicates you are almost out of air!") playsound(usr, 'alert.ogg', 50, 1) @@ -74,6 +75,7 @@ /obj/item/weapon/tank/air/examine() set src in usr + ..() if(air_contents.oxygen < 1) usr << text("\red The meter on the tank indicates you are almost out of air!") playsound(usr, 'alert.ogg', 50, 1) @@ -105,6 +107,7 @@ /obj/item/weapon/tank/emergency_oxygen/examine() set src in usr + ..() if(air_contents.oxygen < 0.4) usr << text("\red The meter on the tank indicates you are almost out of air!") playsound(usr, 'alert.ogg', 50, 1) diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index d6f2532ae5..b57d5a5a67 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -24,11 +24,9 @@ if(confirm == "Yes") suiciding = 1 //instead of killing them instantly, just put them at -175 health and let 'em gasp for a while - viewers(src) << "\red [src] is holding \his breath. It looks like \he's trying to commit suicide." + viewers(src) << "\red [src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide." oxyloss = max(175 - toxloss - fireloss - bruteloss, oxyloss) updatehealth() - spawn(200) //in case they get revived by cryo chamber or something stupid like that, let them suicide again in 20 seconds - suiciding = 0 /mob/living/carbon/brain/verb/suicide() set hidden = 1 @@ -75,11 +73,9 @@ if(confirm == "Yes") suiciding = 1 //instead of killing them instantly, just put them at -175 health and let 'em gasp for a while - viewers(src) << "\red [src] is holding \his breath. It looks like \he's trying to commit suicide." + viewers(src) << "\red [src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide." oxyloss = max(175 - toxloss - fireloss - bruteloss, oxyloss) updatehealth() - spawn(200) //in case they get revived by cryo chamber or something stupid like that, let them suicide again in 20 seconds - suiciding = 0 /mob/living/silicon/ai/verb/suicide() set hidden = 1 diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 865e94fe9d..e2448ab949 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -97,6 +97,7 @@ else usr << "\blue [src.name] is wearing \icon[src.wear_id] [src.wear_id.name]." + if (src.is_jittery) switch(src.jitteriness) if(300 to INFINITY) @@ -106,6 +107,11 @@ if(100 to 200) usr << "\red [src] is twitching ever so slightly." + if (src.suiciding) + switch(src.suiciding) + if(1) + usr << "\red [src.name] appears to have bitten [t_his] tongue off!" + if (src.stat == 2 || (changeling && changeling.changeling_fakedeath == 1)) usr << "\red [src] is limp and unresponsive, a dull lifeless look in [t_his] eyes." else @@ -142,4 +148,6 @@ if (!src.client) usr << "\red [src.name] doesn't seem as though they want to talk." + usr << "\blue *---------*" +