From db89732ce820371597bf2b6cffd491de1ddb1937 Mon Sep 17 00:00:00 2001 From: "petethegoat@gmail.com" Date: Mon, 14 Nov 2011 19:16:35 +0000 Subject: [PATCH] Fix for husk revival. (probably fixes some dna modifier runtimes which relate to husks. see: http://pastebin.com/r2PE5tvU) Small fix for putting stuff in microwaves. Rest of the microwave code is still dicks, though. Fixed shards always appearing in the top right corner. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2521 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/dna.dm | 47 +++++++++++++---------- code/game/machinery/kitchen/microwave.dm | 3 +- code/game/objects/stacks/glass.dm | 12 +++--- icons/obj/shards.dmi | Bin 2207 -> 2217 bytes 4 files changed, 34 insertions(+), 28 deletions(-) diff --git a/code/game/dna.dm b/code/game/dna.dm index 9b3e6e960c0..7c012019af2 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -691,27 +691,32 @@ var/mob/occupant = src.connected.occupant dat = "Occupant Statistics:
" //Blah obvious if (occupant) //is there REALLY someone in there? - if (!istype(occupant,/mob/living/carbon/human)) - sleep(1) - var/t1 - switch(occupant.stat) // obvious, see what their status is - if(0) - t1 = "Conscious" - if(1) - t1 = "Unconscious" - else - t1 = "*dead*" - dat += text("[]\tHealth %: [] ([])
", (occupant.health > 50 ? "" : ""), occupant.health, t1) - dat += text("Radiation Level: []%

", occupant.radiation) - dat += text("Unique Enzymes : []
", uppertext(occupant.dna.unique_enzymes)) - dat += text("Unique Identifier: []
", occupant.dna.uni_identity) - dat += text("Structural Enzymes: []

", occupant.dna.struc_enzymes) - dat += text("Modify Unique Identifier
", src) - dat += text("Modify Structural Enzymes

", src) - dat += text("View/Edit/Transfer Buffer

", src) - dat += text("Pulse Radiation
", src) - dat += text("Radiation Emitter Settings

", src) - dat += text("Inject Rejuvenators

", src) + if(occupant.mutations & HUSK) + dat += "The occupant's DNA structure is of an unknown configuration, please insert a subject with a standard DNA structure.

" //NOPE. -Pete + dat += text("View/Edit/Transfer Buffer

", src) + dat += text("Radiation Emitter Settings

", src) + else + if (!istype(occupant,/mob/living/carbon/human)) + sleep(1) + var/t1 + switch(occupant.stat) // obvious, see what their status is + if(0) + t1 = "Conscious" + if(1) + t1 = "Unconscious" + else + t1 = "*dead*" + dat += text("[]\tHealth %: [] ([])
", (occupant.health > 50 ? "" : ""), occupant.health, t1) + dat += text("Radiation Level: []%

", occupant.radiation) + dat += text("Unique Enzymes : []
", uppertext(occupant.dna.unique_enzymes)) + dat += text("Unique Identifier: []
", occupant.dna.uni_identity) + dat += text("Structural Enzymes: []

", occupant.dna.struc_enzymes) + dat += text("Modify Unique Identifier
", src) + dat += text("Modify Structural Enzymes

", src) + dat += text("View/Edit/Transfer Buffer

", src) + dat += text("Pulse Radiation
", src) + dat += text("Radiation Emitter Settings

", src) + dat += text("Inject Rejuvenators

", src) else dat += "The scanner is empty.

" dat += text("View/Edit/Transfer Buffer

", src) diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index f01665210e6..0a57dec0de8 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -106,7 +106,8 @@ "\blue [user] has added one of [O] to \the [src].", \ "\blue You add one of [O] to \the [src].") else - user.before_take_item(O) + // user.before_take_item(O) //This just causes problems so far as I can tell. -Pete + user.drop_item() O.loc = src user.visible_message( \ "\blue [user] has added \the [O] to \the [src].", \ diff --git a/code/game/objects/stacks/glass.dm b/code/game/objects/stacks/glass.dm index ca5b0f1e051..04dd4284ced 100644 --- a/code/game/objects/stacks/glass.dm +++ b/code/game/objects/stacks/glass.dm @@ -139,14 +139,14 @@ SHARDS src.icon_state = pick("large", "medium", "small") switch(src.icon_state) if("small") - src.pixel_x = rand(1, 18) - src.pixel_y = rand(1, 18) + src.pixel_x = rand(-12, 12) + src.pixel_y = rand(-12, 12) if("medium") - src.pixel_x = rand(1, 16) - src.pixel_y = rand(1, 16) + src.pixel_x = rand(-8, 8) + src.pixel_y = rand(-8, 8) if("large") - src.pixel_x = rand(1, 10) - src.pixel_y = rand(1, 5) + src.pixel_x = rand(-5, 5) + src.pixel_y = rand(-5, 5) else return diff --git a/icons/obj/shards.dmi b/icons/obj/shards.dmi index f6dc588e7d702c225925267054d0913d7c389ef6..5ae1402c368ed52ed1b85c33d55d62ee837052c9 100644 GIT binary patch delta 2048 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 U#au0}tN;K207*qoM6N<$f{{wfL;wH)