diff --git a/code/defines/obj.dm b/code/defines/obj.dm index d114bd6ddb..048ff05a47 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -1078,20 +1078,20 @@ throwforce = 14.0 flags = FPRINT | TABLEPASS | CONDUCT -/obj/item/stack/sheet/r_metal - name = "steel" - singular_name = "steel sheet" +/obj/item/stack/sheet/plasteel + name = "plasteel" + singular_name = "plasteel sheet" desc = "This sheet is an alloy of iron and plasma." - icon_state = "sheet-r_metal" + icon_state = "sheet-plasteel" item_state = "sheet-metal" m_amt = 7500 throwforce = 15.0 flags = FPRINT | TABLEPASS | CONDUCT origin_tech = "materials=2" -/obj/item/stack/tile/steel - name = "Metal floor tile" - singular_name = "Steel floor tile" +/obj/item/stack/tile/plasteel + name = "plasteel tiles" + singular_name = "plasteel floor tile" desc = "Those could work as a pretty decent throwing weapon" icon_state = "tile" w_class = 3.0 @@ -1104,8 +1104,8 @@ max_amount = 60 /obj/item/stack/tile/grass - name = "Grass tile" - singular_name = "Grass floor tile" + name = "grass tiles" + singular_name = "grass floor tile" desc = "A patch of grass like they often use on golf courses" icon_state = "tile_grass" w_class = 3.0 @@ -1118,8 +1118,8 @@ origin_tech = "biotech=1" /obj/item/stack/light_w - name = "Wired glass tile" - singular_name = "Wired glass tile" + name = "wired glass tiles" + singular_name = "wired glass floor tile" desc = "A glass tile, which is wired, somehow." icon_state = "glass_wire" w_class = 3.0 @@ -1154,8 +1154,8 @@ del(src) /obj/item/stack/tile/light - name = "Light floor tile" - singular_name = "Light floor tile" + name = "light tiles" + singular_name = "light floor tile" desc = "A floor tile, made out off glass. It produces light." icon_state = "tile_e" w_class = 3.0 diff --git a/code/defines/turf.dm b/code/defines/turf.dm index 87c7f68286..140f1a3f5a 100644 --- a/code/defines/turf.dm +++ b/code/defines/turf.dm @@ -1,6 +1,6 @@ /turf icon = 'floors.dmi' - var/intact = 1 //for floors, use is_plating(), is_steel_floor() and is_light_floor() + var/intact = 1 //for floors, use is_plating(), is_plasteel_floor() and is_light_floor() level = 1.0 @@ -26,7 +26,7 @@ return 0 proc/is_asteroid_floor() return 0 - proc/is_steel_floor() + proc/is_plasteel_floor() return 0 proc/is_light_floor() return 0 @@ -81,7 +81,7 @@ blocks_air = 1 thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT - heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m steel wall + heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall var/walltype = "wall" diff --git a/code/game/dna.dm b/code/game/dna.dm index 36c2650196..ccbe421d0c 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -719,7 +719,7 @@ dat = "Occupant Statistics:
" //Blah obvious if(occupant && occupant.dna) //is there REALLY someone in there? 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 += "The occupant's DNA structure is ruined beyond recognition, please insert a subject with an intact DNA structure.

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

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

", src) else diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index 8614b3067f..460f3a67ea 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -80,7 +80,7 @@ return if (M.mutations & HUSK) - usr << "\red This creature has already been drained!" + usr << "\red This creature's DNA is ruined beyond useability!" return if (!G.killing) @@ -137,9 +137,7 @@ usr.changeling.isabsorbing = 0 T.death(0) - T.real_name = "Unknown" - T.mutations |= HUSK - T.update_body() + T.ChangeToHusk() return diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index 37d8c28d0c..94067e9351 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -99,8 +99,8 @@ /obj/machinery/bot/floorbot/attackby(var/obj/item/W , mob/user as mob) - if(istype(W, /obj/item/stack/tile/steel)) - var/obj/item/stack/tile/steel/T = W + if(istype(W, /obj/item/stack/tile/plasteel)) + var/obj/item/stack/tile/plasteel/T = W if(src.amount >= 50) return var/loaded = min(50-src.amount, T.amount) @@ -169,7 +169,7 @@ floorbottargets += bot.target if(src.amount <= 0 && ((src.target == null) || !src.target)) if(src.eattiles) - for(var/obj/item/stack/tile/steel/T in view(7, src)) + for(var/obj/item/stack/tile/plasteel/T in view(7, src)) if(T != src.oldtarget && !(target in floorbottargets)) src.oldtarget = T src.target = T @@ -215,7 +215,7 @@ src.target = F break if((!src.target || src.target == null) && src.eattiles) - for(var/obj/item/stack/tile/steel/T in view(7, src)) + for(var/obj/item/stack/tile/plasteel/T in view(7, src)) if(!(T in floorbottargets) && T != src.oldtarget) src.oldtarget = T src.target = T @@ -245,7 +245,7 @@ src.path = new() if(src.loc == src.target || src.loc == src.target.loc) - if(istype(src.target, /obj/item/stack/tile/steel)) + if(istype(src.target, /obj/item/stack/tile/plasteel)) src.eattile(src.target) else if(istype(src.target, /obj/item/stack/sheet/metal)) src.maketile(src.target) @@ -270,7 +270,7 @@ if(istype(target, /turf/space/)) for(var/mob/O in viewers(src, null)) O.show_message(text("\red [src] begins to repair the hole"), 1) - var/obj/item/stack/tile/steel/T = new /obj/item/stack/tile/steel + var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel src.repairing = 1 spawn(50) T.build(src.loc) @@ -291,8 +291,8 @@ src.anchored = 0 src.target = null -/obj/machinery/bot/floorbot/proc/eattile(var/obj/item/stack/tile/steel/T) - if(!istype(T, /obj/item/stack/tile/steel)) +/obj/machinery/bot/floorbot/proc/eattile(var/obj/item/stack/tile/plasteel/T) + if(!istype(T, /obj/item/stack/tile/plasteel)) return for(var/mob/O in viewers(src, null)) O.show_message(text("\red [src] begins to collect tiles."), 1) @@ -326,7 +326,7 @@ src.target = null src.repairing = 0 return - var/obj/item/stack/tile/steel/T = new /obj/item/stack/tile/steel + var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel T.amount = 4 T.loc = M.loc del(M) @@ -353,7 +353,7 @@ new /obj/item/robot_parts/l_arm(Tsec) if (amount) - new /obj/item/stack/tile/steel(Tsec) // only one tile, yes + new /obj/item/stack/tile/plasteel(Tsec) // only one tile, yes var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) @@ -362,8 +362,8 @@ return -/obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/steel/T, mob/user as mob) - if(!istype(T, /obj/item/stack/tile/steel)) +/obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/plasteel/T, mob/user as mob) + if(!istype(T, /obj/item/stack/tile/plasteel)) ..() return if(src.contents.len >= 1) diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 5af4c25551..a38e72267a 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -24,7 +24,7 @@ P:welding = 2 if(do_after(user, 20)) user << "\blue You deconstruct the frame." - new /obj/item/stack/sheet/r_metal( loc, 4) + new /obj/item/stack/sheet/plasteel( loc, 4) del(src) P:welding = 1 if(1) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 7e40562372..e4e2b2dfa5 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -1,6 +1,6 @@ -///////////////////////////////////////// -// SUIT STORAGE UNIT :3 ///////////////// -///////////////////////////////////////// +////////////////////////////////////// +// SUIT STORAGE UNIT ///////////////// +////////////////////////////////////// /obj/machinery/suit_storage_unit diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 42efe367e0..8039cf0c9a 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -100,7 +100,7 @@ "backkey"=/obj/item/weapon/crowbar, "desc"="External armor is installed."), //3 - list("key"=/obj/item/stack/sheet/r_metal, + list("key"=/obj/item/stack/sheet/plasteel, "backkey"=/obj/item/weapon/weldingtool, "desc"="Internal armor is welded."), //4 @@ -227,7 +227,7 @@ user.visible_message("[user] secures external armor layer.", "You secure external reinforced armor layer.") else user.visible_message("[user] pries external armor layer from [holder].", "You prie external armor layer from [holder].") - var/obj/item/stack/sheet/r_metal/MS = new /obj/item/stack/sheet/r_metal(get_turf(holder)) + var/obj/item/stack/sheet/plasteel/MS = new /obj/item/stack/sheet/plasteel(get_turf(holder)) MS.amount = 5 if(1) if(diff==FORWARD) @@ -507,7 +507,7 @@ result = "/obj/mecha/working/firefighter" steps = list(list("key"=/obj/item/weapon/weldingtool),//1 list("key"=/obj/item/weapon/wrench),//2 - list("key"=/obj/item/stack/sheet/r_metal),//3 + list("key"=/obj/item/stack/sheet/plasteel),//3 list("key"=/obj/item/weapon/weldingtool),//4 list("key"=/obj/item/weapon/wrench),//5 list("key"=/obj/item/stack/sheet/metal),//6 diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 366e475a16..a55f8433a3 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -10,7 +10,7 @@ density = 1 anchored = 1 opacity = 0 - var/list/welder_salvage = list(/obj/item/stack/sheet/r_metal,/obj/item/stack/sheet/metal,/obj/item/stack/rods) + var/list/welder_salvage = list(/obj/item/stack/sheet/plasteel,/obj/item/stack/sheet/metal,/obj/item/stack/rods) var/list/wirecutters_salvage = list(/obj/item/weapon/cable_coil) var/list/crowbar_salvage var/salvage_num = 5 diff --git a/code/game/objects/items/weapons/table_rack_parts.dm b/code/game/objects/items/weapons/table_rack_parts.dm index cd341fcb9b..71106b22ed 100644 --- a/code/game/objects/items/weapons/table_rack_parts.dm +++ b/code/game/objects/items/weapons/table_rack_parts.dm @@ -41,7 +41,7 @@ RACK PARTS /obj/item/weapon/table_parts/reinforced/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if (istype(W, /obj/item/weapon/wrench)) - new /obj/item/stack/sheet/r_metal( src.loc ) + new /obj/item/stack/sheet/plasteel( src.loc ) //SN src = null del(src) diff --git a/code/game/objects/stacks/metal.dm b/code/game/objects/stacks/metal.dm index 2920c6f7f1..f37de2d988 100644 --- a/code/game/objects/stacks/metal.dm +++ b/code/game/objects/stacks/metal.dm @@ -71,7 +71,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ null, \ new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 2, one_per_turf = 1), \ null, \ - new/datum/stack_recipe("floor tile", /obj/item/stack/tile/steel, 1, 4, 10), \ + new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 10), \ new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \ null, \ new/datum/stack_recipe("computer frame", /obj/structure/computerframe, 5, one_per_turf = 1), \ @@ -94,27 +94,27 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ // REINFORCED METAL SHEET // /datum/stack_recipe/New(title, result_type, req_amount, res_amount, max_res_amount, time, one_per_turf, on_floor = 0) -var/global/list/datum/stack_recipe/r_metal_recipes = list ( \ +var/global/list/datum/stack_recipe/plasteel_recipes = list ( \ new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/reinforced, 2), \ new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, one_per_turf = 1), \ ) -/obj/item/stack/sheet/r_metal +/obj/item/stack/sheet/plasteel New(var/loc, var/amount=null) - recipes = r_metal_recipes + recipes = plasteel_recipes return ..() // TILES -/obj/item/stack/tile/steel/New(var/loc, var/amount=null) +/obj/item/stack/tile/plasteel/New(var/loc, var/amount=null) ..() src.pixel_x = rand(1, 14) src.pixel_y = rand(1, 14) return -/obj/item/stack/tile/steel/attack_self(mob/user as mob) +/obj/item/stack/tile/plasteel/attack_self(mob/user as mob) if (usr.stat) return var/T = user.loc @@ -129,7 +129,7 @@ var/global/list/datum/stack_recipe/r_metal_recipes = list ( \ use(1) return -/obj/item/stack/tile/steel/proc/build(turf/S as turf) +/obj/item/stack/tile/plasteel/proc/build(turf/S as turf) S.ReplaceWithPlating() // var/turf/simulated/floor/W = S.ReplaceWithFloor() // W.make_plating() diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 5c4ea94a86..8146c3c195 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -35,7 +35,7 @@ obj/structure new /obj/structure/falsewall (src.loc) del(src) - else if(istype(W, /obj/item/stack/sheet/r_metal) && istype(src,/obj/structure/girder/displaced)) + else if(istype(W, /obj/item/stack/sheet/plasteel) && istype(src,/obj/structure/girder/displaced)) W:use(2) user << "\blue You create a false r wall! Push on it to open or close the passage." new /obj/structure/falserwall (src.loc) @@ -84,7 +84,7 @@ obj/structure del(src) return - else if (istype(W, /obj/item/stack/sheet/r_metal)) + else if (istype(W, /obj/item/stack/sheet/plasteel)) if (src.icon_state == "reinforced") //Time to finalize! user << "\blue Now finalising reinforced wall." if(do_after(user, 50)) diff --git a/code/game/turf.dm b/code/game/turf.dm index 7b8d7d8a79..d576926f2b 100644 --- a/code/game/turf.dm +++ b/code/game/turf.dm @@ -275,11 +275,11 @@ if(!devastated) playsound(src.loc, 'Welder.ogg', 100, 1) new /obj/structure/girder/reinforced(src) - new /obj/item/stack/sheet/r_metal( src ) + new /obj/item/stack/sheet/plasteel( src ) else new /obj/item/stack/sheet/metal( src ) new /obj/item/stack/sheet/metal( src ) - new /obj/item/stack/sheet/r_metal( src ) + new /obj/item/stack/sheet/plasteel( src ) else if(!devastated) playsound(src.loc, 'Welder.ogg', 100, 1) @@ -664,7 +664,7 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3 /turf/simulated/floor //Note to coders, the 'intact' var can no longer be used to determine if the floor is a plating or not. - //Use the is_plating(), is_steel_floor() and is_light_floor() procs instead. --Errorage + //Use the is_plating(), is_plasteel_floor() and is_light_floor() procs instead. --Errorage name = "floor" icon = 'floors.dmi' icon_state = "floor" @@ -674,7 +674,7 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3 heat_capacity = 10000 var/broken = 0 var/burnt = 0 - var/obj/item/stack/tile/floor_tile = new/obj/item/stack/tile/steel + var/obj/item/stack/tile/floor_tile = new/obj/item/stack/tile/plasteel airless icon_state = "floor" @@ -819,7 +819,7 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3 return turf/simulated/floor/proc/update_icon() - if(is_steel_floor()) + if(is_plasteel_floor()) if(!broken && !burnt) icon_state = icon_regular_floor if(is_plating()) @@ -915,8 +915,8 @@ turf/simulated/floor/return_siding_icon_state() make_plating() break_tile() -/turf/simulated/floor/is_steel_floor() - if(istype(floor_tile,/obj/item/stack/tile/steel)) +/turf/simulated/floor/is_plasteel_floor() + if(istype(floor_tile,/obj/item/stack/tile/plasteel)) return 1 else return 0 @@ -943,10 +943,10 @@ turf/simulated/floor/return_siding_icon_state() if(istype(src,/turf/simulated/floor/mech_bay_recharge_floor)) src.ReplaceWithPlating() if(broken) return - if(is_steel_floor()) + if(is_plasteel_floor()) src.icon_state = "damaged[pick(1,2,3,4,5)]" broken = 1 - else if(is_steel_floor()) + else if(is_plasteel_floor()) src.icon_state = "light_broken" broken = 1 else if(is_plating()) @@ -959,10 +959,10 @@ turf/simulated/floor/return_siding_icon_state() /turf/simulated/floor/proc/burn_tile() if(istype(src,/turf/simulated/floor/engine)) return if(broken || burnt) return - if(is_steel_floor()) + if(is_plasteel_floor()) src.icon_state = "damaged[pick(1,2,3,4,5)]" burnt = 1 - else if(is_steel_floor()) + else if(is_plasteel_floor()) src.icon_state = "floorscorched[pick(1,2)]" burnt = 1 else if(is_plating()) @@ -995,16 +995,16 @@ turf/simulated/floor/return_siding_icon_state() update_icon() levelupdate() -//This proc will make the turf a steel floor tile. The expected argument is the tile to make the turf with +//This proc will make the turf a plasteel floor tile. The expected argument is the tile to make the turf with //If none is given it will make a new object. dropping or unequipping must be handled before or after calling //this proc. -/turf/simulated/floor/proc/make_steel_floor(var/obj/item/stack/tile/steel/T = null) +/turf/simulated/floor/proc/make_plasteel_floor(var/obj/item/stack/tile/plasteel/T = null) broken = 0 burnt = 0 intact = 1 sd_SetLuminosity(0) if(T) - if(istype(T,/obj/item/stack/tile/steel)) + if(istype(T,/obj/item/stack/tile/plasteel)) floor_tile = T if (icon_regular_floor) icon_state = icon_regular_floor @@ -1015,7 +1015,7 @@ turf/simulated/floor/return_siding_icon_state() levelupdate() return //if you gave a valid parameter, it won't get thisf ar. - floor_tile = new/obj/item/stack/tile/steel + floor_tile = new/obj/item/stack/tile/plasteel icon_state = "floor" icon_regular_floor = icon_state @@ -1209,10 +1209,10 @@ turf/simulated/floor/return_siding_icon_state() R.use(1) return - if (istype(C, /obj/item/stack/tile/steel)) + if (istype(C, /obj/item/stack/tile/plasteel)) var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) if(L) - var/obj/item/stack/tile/steel/S = C + var/obj/item/stack/tile/plasteel/S = C del(L) playsound(src.loc, 'Genhit.ogg', 50, 1) S.build(src) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 621ab2e196..b1622ab21c 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -474,13 +474,13 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that M.equip_if_possible(new /obj/item/weapon/chem_grenade/cleaner(M), M.slot_r_store) M.equip_if_possible(new /obj/item/weapon/chem_grenade/cleaner(M), M.slot_l_store) - M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack) - M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack) - M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack) - M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack) - M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack) - M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack) - M.equip_if_possible(new /obj/item/stack/tile/steel(M), M.slot_in_backpack) + M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack) + M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack) + M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack) + M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack) + M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack) + M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack) + M.equip_if_possible(new /obj/item/stack/tile/plasteel(M), M.slot_in_backpack) if ("pirate") M.equip_if_possible(new /obj/item/clothing/under/pirate(M), M.slot_w_uniform) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index ae3f9d3f37..ebc537d356 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -304,8 +304,8 @@ if (ore_iron > 0 && ore_plasma > 0) ore_iron--; ore_plasma--; - new /obj/item/stack/sheet/r_metal(output.loc) - feedback_inc("mining_steel_produced",1) + new /obj/item/stack/sheet/plasteel(output.loc) + feedback_inc("mining_steel_produced",1) //should be plasteel, but that'd break Erro's stat logging -- Urist else on = 0 continue diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index fabb98b034..6d93655192 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -26,8 +26,8 @@ if(machine.ore_iron) dat += text("Iron: [machine.ore_iron] Release
") - if(machine.ore_steel) - dat += text("Steel: [machine.ore_steel] Release
") + if(machine.ore_plasteel) + dat += text("Plasteel: [machine.ore_plasteel] Release
") if(machine.ore_glass) dat += text("Glass: [machine.ore_glass] Release
") if(machine.ore_rglass) @@ -106,12 +106,12 @@ G.amount = machine.ore_iron G.loc = machine.output.loc machine.ore_iron = 0 - if ("steel") - if (machine.ore_steel > 0) - var/obj/item/stack/sheet/r_metal/G = new /obj/item/stack/sheet/r_metal - G.amount = machine.ore_steel + if ("plasteel") + if (machine.ore_plasteel > 0) + var/obj/item/stack/sheet/plasteel/G = new /obj/item/stack/sheet/plasteel + G.amount = machine.ore_plasteel G.loc = machine.output.loc - machine.ore_steel = 0 + machine.ore_plasteel = 0 if ("clown") if (machine.ore_clown > 0) var/obj/item/stack/sheet/clown/G = new /obj/item/stack/sheet/clown @@ -151,7 +151,7 @@ var/ore_clown = 0; var/ore_glass = 0; var/ore_rglass = 0; - var/ore_steel = 0; + var/ore_plasteel = 0; var/ore_adamantine = 0; var/stack_amt = 50; //ammount to stack before releassing @@ -209,8 +209,8 @@ ore_rglass+= O:amount del(O) continue - if (istype(O,/obj/item/stack/sheet/r_metal)) - ore_steel+= O:amount + if (istype(O,/obj/item/stack/sheet/plasteel)) + ore_plasteel+= O:amount del(O) continue if (istype(O,/obj/item/stack/sheet/adamantine)) @@ -275,11 +275,11 @@ G.loc = output.loc ore_rglass -= stack_amt return - if (ore_steel >= stack_amt) - var/obj/item/stack/sheet/r_metal/G = new /obj/item/stack/sheet/r_metal + if (ore_plasteel >= stack_amt) + var/obj/item/stack/sheet/plasteel/G = new /obj/item/stack/sheet/plasteel G.amount = stack_amt G.loc = output.loc - ore_steel -= stack_amt + ore_plasteel -= stack_amt return if (ore_adamantine >= stack_amt) var/obj/item/stack/sheet/adamantine/G = new /obj/item/stack/sheet/adamantine diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index fcc51e9f13..b788adaa65 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -74,3 +74,11 @@ world.Reboot() return ..(gibbed) + +/mob/living/carbon/human/proc/ChangeToHusk() + if(mutations & HUSK) + return + mutations |= HUSK + real_name = "Unknown" + update_body() + return \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index bd47c91ae4..49bc3afff8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -2202,6 +2202,9 @@ It can still be worn/put on as normal. src.stat = 0 return src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss() - src.getCloneLoss() + if(getFireLoss() > 100 && stat == DEAD) + ChangeToHusk() + return /mob/living/carbon/human/abiotic(var/full_body = 0) diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi index df8282e032..ee3957df72 100644 Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 5919c6b183..9fc27ef459 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 3a7542e092..6ac3b56a2a 100644 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -1341,7 +1341,7 @@ "azO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/ai_monitored/storage/eva) "azP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "azQ" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) -"azR" = (/obj/item/stack/sheet/r_metal{amount = 10},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) +"azR" = (/obj/item/stack/sheet/plasteel{amount = 10},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/ai_monitored/storage/eva) "azS" = (/obj/machinery/suit_storage_unit/standard_unit,/turf/simulated/floor{icon_state = "dark"},/area/ai_monitored/storage/eva) "azT" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/fore) "azU" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/fore) @@ -5064,7 +5064,7 @@ "bTt" = (/obj/machinery/door/window{dir = 8; icon = 'windoor.dmi'; name = "Virology Holding Rooms"; req_access_txt = "39"},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bTu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bTv" = (/obj/structure/table,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/item/weapon/cell{pixel_x = 5; pixel_y = -5; charge = 100; maxcharge = 15000},/obj/item/device/assembly/prox_sensor{pixel_x = -8; pixel_y = 4},/turf/simulated/floor,/area/assembly/assembly_line) -"bTw" = (/obj/structure/table,/obj/item/stack/sheet/r_metal{amount = 10},/turf/simulated/floor,/area/assembly/assembly_line) +"bTw" = (/obj/structure/table,/obj/item/stack/sheet/plasteel{amount = 10},/turf/simulated/floor,/area/assembly/assembly_line) "bTx" = (/obj/machinery/conveyor{dir = 4; id = "Skynet_heavy"},/turf/simulated/floor/plating{tag = "icon-warnplate (NORTH)"; icon_state = "warnplate"; dir = 1},/area/assembly/assembly_line) "bTy" = (/obj/machinery/conveyor{dir = 4; id = "Skynet_heavy"},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/plating{tag = "icon-warnplate (NORTH)"; icon_state = "warnplate"; dir = 1},/area/assembly/assembly_line) "bTz" = (/obj/machinery/conveyor{dir = 4; id = "Skynet_heavy"},/obj/machinery/light,/turf/simulated/floor/plating{tag = "icon-warnplate (NORTH)"; icon_state = "warnplate"; dir = 1},/area/assembly/assembly_line) @@ -5512,7 +5512,7 @@ "cbZ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/shuttle/escape_pod5/station) "cca" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/starboardsolar) "ccb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/cable,/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/window/reinforced{dir = 8},/obj/effect/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/floor/plating,/area/engine/engineering) -"ccc" = (/obj/item/stack/sheet/r_metal{amount = 10},/turf/simulated/floor,/area/engine/engineering) +"ccc" = (/obj/item/stack/sheet/plasteel{amount = 10},/turf/simulated/floor,/area/engine/engineering) "ccd" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/engine/engineering) "cce" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_y = 5},/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/engine/engineering) "ccf" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{dir = 2; icon_state = "warning"},/area/engine/engineering)