From 86f80d5a6927a067a49bf42b4b084519deaa58cf Mon Sep 17 00:00:00 2001 From: Markolie Date: Sat, 6 Dec 2014 08:28:02 +0100 Subject: [PATCH] IPC fixes galore --- .gitignore | 6 +-- code/game/machinery/OpTable.dm | 54 ++++++------------- code/game/objects/items/weapons/tools.dm | 26 ++++++--- code/modules/mob/living/carbon/brain/say.dm | 3 ++ code/modules/mob/living/carbon/human/death.dm | 24 +++++---- code/modules/mob/living/carbon/human/life.dm | 3 ++ code/modules/power/cable.dm | 6 +++ code/modules/reagents/reagent_dispenser.dm | 1 + code/modules/research/designs.dm | 10 ++++ .../xenoarchaeology/artifact/artifact.dm | 19 +++++++ code/modules/surgery/face.dm | 2 + code/modules/surgery/headreattach.dm | 49 ++++++++++++----- code/modules/surgery/robolimbs.dm | 44 ++++++++++----- maps/cyberiad.dmm | 2 +- 14 files changed, 167 insertions(+), 82 deletions(-) diff --git a/.gitignore b/.gitignore index c1c488d24b6..b0cdc822cb3 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,6 @@ #ignore other, specific files and folers data/ -maps/backup/* -maps/cyberiad.dmm.backup -nano/debug.html \ No newline at end of file +/maps/backup/* +/maps/cyberiad.dmm.backup +/nano/debug.html \ No newline at end of file diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index f16bfc65334..36984e5c314 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -20,11 +20,8 @@ if (computer) computer.table = src break -// spawn(100) //Wont the MC just call this process() before and at the 10 second mark anyway? -// process() /obj/machinery/optable/ex_act(severity) - switch(severity) if(1.0) //SN src = null @@ -76,41 +73,17 @@ /obj/machinery/optable/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob) - - if(O.loc == user) //no you can't pull things out of your ass - return - if(user.restrained() || user.stat || user.weakened || user.stunned || user.paralysis || user.resting) //are you cuffed, dying, lying, stunned or other - return - if(O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src)) // is the mob anchored, too far away from you, or are you too far away from the source - return - if(!ismob(O)) //humans only - return - if(istype(O, /mob/living/simple_animal) || istype(O, /mob/living/silicon)) //animals and robutts dont fit - return - if(!ishuman(user) && !isrobot(user)) //No ghosts or mice putting people into the sleeper - return - if(user.loc==null) // just in case someone manages to get a closet into the blue light dimension, as unlikely as that seems - return - if(!istype(user.loc, /turf) || !istype(O.loc, /turf)) // are you in a container/closet/pod/etc? + if(usr.stat || !ishuman(usr) || usr.restrained() || !check_table(usr)) return + var/mob/living/L = O - if(!istype(L) || L.buckled) - return - for(var/mob/living/carbon/slime/M in range(1,L)) - if(M.Victim == L) - usr << "[L.name] cannot be operated on while they have \a [M] attached to their head!" - return - if(src.victim) - usr << "\blue The table is already occupied!" - return - - take_victim(L, user) + take_victim(L,usr) return /obj/machinery/optable/proc/check_victim() if(locate(/mob/living/carbon/human, src.loc)) var/mob/living/carbon/human/M = locate(/mob/living/carbon/human, src.loc) - if(M.resting) + if(M.lying) src.victim = M icon_state = M.pulse ? "table2-active" : "table2-idle" return 1 @@ -146,11 +119,7 @@ set category = "Object" set src in oview(1) - if(usr.stat || !ishuman(usr) || usr.buckled || usr.restrained()) - return - - if(src.victim) - usr << "\blue The table is already occupied!" + if(usr.stat || !ishuman(usr) || usr.restrained() || !check_table(usr)) return take_victim(usr,usr) @@ -162,5 +131,14 @@ del(W) return -/obj/machinery/optable/slime - icon_state = "table-slime" + +/obj/machinery/optable/proc/check_table(mob/living/carbon/patient as mob) + if(src.victim) + usr << "\blue The table is already occupied!" + return 0 + + if(patient.buckled) + usr << "\blue Unbuckle first!" + return 0 + + return 1 diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 96d58bf6dc6..4838c848339 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -463,7 +463,6 @@ item_state = "crowbar_red" /obj/item/weapon/weldingtool/attack(mob/M as mob, mob/user as mob) - if(hasorgans(M)) var/datum/organ/external/S = M:organs_by_name[user.zone_sel.selecting] @@ -480,14 +479,27 @@ return if(S.brute_dam) - S.heal_damage(15,0,0,1) - user.visible_message("\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src].") - if(istype(M,/mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - H.updatehealth() - return + var/obj/item/weapon/weldingtool/WT = src + if (WT.remove_fuel(0,user)) + playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) + S.heal_damage(15,0,0,1) + user.visible_message("\red \The [user] patches some dents on \the [M]'s [S.display_name] with \the [src].") + if(istype(M,/mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + H.updatehealth() + if(istype(M,/mob/living/carbon/human/machine) && M.stat == 0) // If an IPC is brought back to life by welding it, which is possible, update the mob list + if(M in dead_mob_list) + dead_mob_list -= M + respawnable_list -= M + living_mob_list += M + mob_list += M + return + else + user << "\red You need more welding fuel to complete this task." + return else user << "Nothing to fix!" + return else return ..() diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm index fa09d87f22a..1e7a9da9a76 100644 --- a/code/modules/mob/living/carbon/brain/say.dm +++ b/code/modules/mob/living/carbon/brain/say.dm @@ -1,6 +1,9 @@ /mob/living/carbon/brain/say(var/message) if (silent) return + + if (stat == 2) // Dead. + return say_dead(message) if(!(container && (istype(container, /obj/item/device/mmi) || istype(container, /obj/item/device/mmi/posibrain)))) return //No MMI, can't speak, bucko./N diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index f18ab76d718..55e894b90bf 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -5,13 +5,13 @@ canmove = 0 icon = null invisibility = 101 + if(!(species.flags & IS_SYNTHETIC)) + animation = new(loc) + animation.icon_state = "blank" + animation.icon = 'icons/mob/mob.dmi' + animation.master = src - animation = new(loc) - animation.icon_state = "blank" - animation.icon = 'icons/mob/mob.dmi' - animation.master = src - - playsound(src.loc, 'sound/effects/gib.ogg', 100, 1, 10) + playsound(src.loc, 'sound/effects/gib.ogg', 100, 1, 10) for(var/datum/organ/external/E in src.organs) if(istype(E, /datum/organ/external/chest)) @@ -20,9 +20,15 @@ if(prob(100 - E.get_damage())) // Override the current limb status and don't cause an explosion E.droplimb(1,1) - - flick("gibbed-h", animation) - hgibs(loc, viruses, dna) + + if(!(species.flags & IS_SYNTHETIC)) + flick("gibbed-h", animation) + hgibs(loc, viruses, dna) + else + new /obj/effect/decal/cleanable/robot_debris(src.loc) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(3, 1, src) + s.start() spawn(15) if(animation) del(animation) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 1f2b53fe5f4..046fad8d152 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1672,6 +1672,9 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc proc/handle_decay() var/decaytime = world.time - timeofdeath + + if(species.flags & IS_SYNTHETIC) + return if(decaytime <= 6000) //10 minutes for decaylevel1 -- stinky return diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index c688127ad2b..1223913f0ce 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -633,6 +633,12 @@ obj/structure/cable/proc/cableColor(var/colorC) if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M H.updatehealth() + if(istype(M,/mob/living/carbon/human/machine) && M.stat == 0) // If an IPC is brought back to life by welding it, which is possible, update the mob list + if(M in dead_mob_list) + dead_mob_list -= M + respawnable_list -= M + living_mob_list += M + mob_list += M return else user << "Nothing to fix!" diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index b97908a76ab..f4736a33fdd 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -251,6 +251,7 @@ icon_state = "virusfoodtank" amount_per_transfer_from_this = 10 anchored = 1 + density = 0 New() ..() diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 85ad55e083c..aef3092f261 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -1579,6 +1579,16 @@ datum/design/adv_reagent_scanner reliability_base = 74 build_path = "/obj/item/device/reagent_scanner/adv" +datum/design/cyborg_analyzer + name = "Cyborg Analyzer" + desc = "A hand-held scanner able to diagnose robotic injuries." + id = "cyborg_analyzer" + req_tech = list("programming" = 2, "biotech" = 2, "magnets" = 2) + build_type = PROTOLATHE + materials = list("$metal" = 30, "$glass" = 20) + reliability_base = 74 + build_path = "/obj/item/device/robotanalyzer" + datum/design/mmi name = "Man-Machine Interface" desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity." diff --git a/code/modules/research/xenoarchaeology/artifact/artifact.dm b/code/modules/research/xenoarchaeology/artifact/artifact.dm index 669ae3d17b0..1ba21f79667 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact.dm @@ -44,6 +44,25 @@ /obj/structure/boulder/New() icon_state = "boulder[rand(1,4)]" excavation_level = rand(5,50) + +/obj/structure/boulder/Bumped(AM) + . = ..() + if(istype(AM,/mob/living/carbon/human)) + var/mob/living/carbon/human/H = AM + if((istype(H.l_hand,/obj/item/weapon/pickaxe)) && (!H.hand)) + attackby(H.l_hand,H) + else if((istype(H.r_hand,/obj/item/weapon/pickaxe)) && H.hand) + attackby(H.r_hand,H) + + else if(istype(AM,/mob/living/silicon/robot)) + var/mob/living/silicon/robot/R = AM + if(istype(R.module_active,/obj/item/weapon/pickaxe)) + attackby(R.module_active,R) + + else if(istype(AM,/obj/mecha)) + var/obj/mecha/M = AM + if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/tool/drill)) + M.selected.action(src) /obj/structure/boulder/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/device/core_sampler)) diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm index daec3c36eca..13a90e1ab2d 100644 --- a/code/modules/surgery/face.dm +++ b/code/modules/surgery/face.dm @@ -128,6 +128,8 @@ if (target.op_stage.face == 3) var/datum/organ/external/head/h = affected h.disfigured = 0 + h.update_icon() + target.regenerate_icons() target.op_stage.face = 0 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) diff --git a/code/modules/surgery/headreattach.dm b/code/modules/surgery/headreattach.dm index 43d5c3c44d2..3c49a9e8c0a 100644 --- a/code/modules/surgery/headreattach.dm +++ b/code/modules/surgery/headreattach.dm @@ -26,20 +26,28 @@ min_duration = 80 max_duration = 100 - + can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/datum/organ/external/affected = target.get_organ(target_zone) return ..() && !(affected.status & ORGAN_CUT_AWAY) begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("[user] starts peeling back tattered flesh where [target]'s head used to be with \the [tool].", \ - "You start peeling back tattered flesh where [target]'s head used to be with \the [tool].") + if(!(target.species.flags & IS_SYNTHETIC)) + user.visible_message("[user] starts peeling back tattered flesh where [target]'s head used to be with \the [tool].", \ + "You start peeling back tattered flesh where [target]'s head used to be with \the [tool].") + else + user.visible_message("[user] starts peeling back metal where [target]'s head used to be with \the [tool].", \ + "You start peeling back metal where [target]'s head used to be with \the [tool].") ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/datum/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] peels back tattered flesh where [target]'s head used to be with \the [tool].", \ - "\blue You peel back tattered flesh where [target]'s head used to be with \the [tool].") + if(!(target.species.flags & IS_SYNTHETIC)) + user.visible_message("\blue [user] peels back tattered flesh where [target]'s head used to be with \the [tool].", \ + "\blue You peel back tattered flesh where [target]'s head used to be with \the [tool].") + else + user.visible_message("\blue [user] peels back metal where [target]'s head used to be with \the [tool].", \ + "\blue You peel back metal where [target]'s head used to be with \the [tool].") affected.status |= ORGAN_CUT_AWAY fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -47,7 +55,7 @@ if (affected.parent) affected = affected.parent user.visible_message("\red [user]'s hand slips, ripping [target]'s [affected.display_name] open!", \ - "\red Your hand slips, ripping [target]'s [affected.display_name] open!") + "\red Your hand slips, ripping [target]'s [affected.display_name] open!") affected.createwound(CUT, 10) @@ -72,16 +80,25 @@ ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - user.visible_message("\blue [user] has finished repositioning flesh and tissue to something anatomically recognizable where [target]'s head used to be with \the [tool].", \ - "\blue You have finished repositioning flesh and tissue to something anatomically recognizable where [target]'s head used to be with \the [tool].") + if(!(target.species.flags & IS_SYNTHETIC)) + user.visible_message("\blue [user] has finished repositioning flesh and tissue to something anatomically recognizable where [target]'s head used to be with \the [tool].", \ + "\blue You have finished repositioning flesh and tissue to something anatomically recognizable where [target]'s head used to be with \the [tool].") + else + user.visible_message("\blue [user] has finished repositioning metal to something recognizable where [target]'s head used to be with \the [tool].", \ + "\blue You have finished repositioning metal to something anatomically recognizable where [target]'s head used to be with \the [tool].") + target.op_stage.head_reattach = 1 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/datum/organ/external/affected = target.get_organ(target_zone) if (affected.parent) affected = affected.parent + if(!(target.species.flags & IS_SYNTHETIC)) user.visible_message("\red [user]'s hand slips, further rending flesh on [target]'s neck!", \ "\red Your hand slips, further rending flesh on [target]'s neck!") + else + user.visible_message("\red [user]'s hand slips, further rending metal on [target]'s neck!", \ + "\red Your hand slips, further rending metal on [target]'s neck!") target.apply_damage(10, BRUTE, affected) /datum/surgery_step/head/suture @@ -99,8 +116,12 @@ begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) // var/datum/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] is stapling and suturing flesh into place in [target]'s esophagal and vocal region with \the [tool].", \ - "You start to staple and suture flesh into place in [target]'s esophagal and vocal region with \the [tool].") + if(!(target.species.flags & IS_SYNTHETIC)) + user.visible_message("[user] is stapling and suturing flesh into place in [target]'s esophagal and vocal region with \the [tool].", \ + "You start to staple and suture flesh into place in [target]'s esophagal and vocal region with \the [tool].") + else + user.visible_message("[user] is stapling and suturing metal into place in [target]'s esophagal and vocal region with \the [tool].", \ + "You start to staple and suture metal into place in [target]'s esophagal and vocal region with \the [tool].") ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -175,15 +196,19 @@ user.visible_message("\blue [user] has attached [target]'s head to the body.", \ "\blue You have attached [target]'s head to the body.") affected.status = 0 + if(istype(target,/mob/living/carbon/human/machine)) + affected.status = 128 affected.amputated = 0 affected.destspawn = 0 var/obj/item/weapon/organ/head/B = tool if (B.brainmob.mind) B.brainmob.mind.transfer_to(target) + affected.setAmputatedTree() + target.handle_organs() target.update_body() - target.updatehealth() target.UpdateDamageIcon() - + target.regenerate_icons() + target.updatehealth() del(B) fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) diff --git a/code/modules/surgery/robolimbs.dm b/code/modules/surgery/robolimbs.dm index d79437ace40..94aac677711 100644 --- a/code/modules/surgery/robolimbs.dm +++ b/code/modules/surgery/robolimbs.dm @@ -37,14 +37,22 @@ begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/datum/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] starts cutting away flesh where [target]'s [affected.display_name] used to be with \the [tool].", \ - "You start cutting away flesh where [target]'s [affected.display_name] used to be with \the [tool].") + if(!(target.species.flags & IS_SYNTHETIC)) + user.visible_message("[user] starts cutting away flesh where [target]'s [affected.display_name] used to be with \the [tool].", \ + "You start cutting away flesh where [target]'s [affected.display_name] used to be with \the [tool].") + else + user.visible_message("[user] starts cutting away metal where [target]'s [affected.display_name] used to be with \the [tool].", \ + "You start cutting away metal where [target]'s [affected.display_name] used to be with \the [tool].") ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/datum/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] cuts away flesh where [target]'s [affected.display_name] used to be with \the [tool].", \ - "\blue You cut away flesh where [target]'s [affected.display_name] used to be with \the [tool].") + if(!(target.species.flags & IS_SYNTHETIC)) + user.visible_message("\blue [user] cuts away flesh where [target]'s [affected.display_name] used to be with \the [tool].", \ + "\blue You cut away flesh where [target]'s [affected.display_name] used to be with \the [tool].") + else + user.visible_message("\blue [user] cuts away metal where [target]'s [affected.display_name] used to be with \the [tool].", \ + "\blue You cut away metal where [target]'s [affected.display_name] used to be with \the [tool].") affected.status |= ORGAN_CUT_AWAY fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -52,7 +60,7 @@ if (affected.parent) affected = affected.parent user.visible_message("\red [user]'s hand slips, cutting [target]'s [affected.display_name] open!", \ - "\red Your hand slips, cutting [target]'s [affected.display_name] open!") + "\red Your hand slips, cutting [target]'s [affected.display_name] open!") affected.createwound(CUT, 10) @@ -71,22 +79,34 @@ begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/datum/organ/external/affected = target.get_organ(target_zone) - user.visible_message("[user] is beginning reposition flesh and nerve endings where where [target]'s [affected.display_name] used to be with [tool].", \ - "You start repositioning flesh and nerve endings where where [target]'s [affected.display_name] used to be with [tool].") + if(!(target.species.flags & IS_SYNTHETIC)) + user.visible_message("[user] is beginning to reposition flesh and nerve endings where where [target]'s [affected.display_name] used to be with [tool].", \ + "You start repositioning flesh and nerve endings where where [target]'s [affected.display_name] used to be with [tool].") + else + user.visible_message("[user] is beginning to reposition metal and wire endings where where [target]'s [affected.display_name] used to be with [tool].", \ + "You start repositioning metal and wire endings where where [target]'s [affected.display_name] used to be with [tool].") ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/datum/organ/external/affected = target.get_organ(target_zone) - user.visible_message("\blue [user] has finished repositioning flesh and nerve endings where [target]'s [affected.display_name] used to be with [tool].", \ - "\blue You have finished repositioning flesh and nerve endings where [target]'s [affected.display_name] used to be with [tool].") + if(!(target.species.flags & IS_SYNTHETIC)) + user.visible_message("\blue [user] has finished repositioning flesh and nerve endings where [target]'s [affected.display_name] used to be with [tool].", \ + "\blue You have finished repositioning flesh and nerve endings where [target]'s [affected.display_name] used to be with [tool].") + else + user.visible_message("\blue [user] has finished repositioning metal and wire endings where [target]'s [affected.display_name] used to be with [tool].", \ + "\blue You have finished repositioning metal and wire endings where [target]'s [affected.display_name] used to be with [tool].") affected.open = 3 fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/datum/organ/external/affected = target.get_organ(target_zone) if (affected.parent) affected = affected.parent - user.visible_message("\red [user]'s hand slips, tearing flesh on [target]'s [affected.display_name]!", \ - "\red Your hand slips, tearing flesh on [target]'s [affected.display_name]!") + if(!(target.species.flags & IS_SYNTHETIC)) + user.visible_message("\red [user]'s hand slips, tearing flesh on [target]'s [affected.display_name]!", \ + "\red Your hand slips, tearing flesh on [target]'s [affected.display_name]!") + else + user.visible_message("\red [user]'s hand slips, tearing metal on [target]'s [affected.display_name]!", \ + "\red Your hand slips, tearing metal on [target]'s [affected.display_name]!") target.apply_damage(10, BRUTE, affected, sharp=1) @@ -108,7 +128,7 @@ begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/datum/organ/external/affected = target.get_organ(target_zone) user.visible_message("[user] starts adjusting area around [target]'s [affected.display_name] with \the [tool].", \ - "You start adjusting area around [target]'s [affected.display_name] with \the [tool]..") + "You start adjusting area around [target]'s [affected.display_name] with \the [tool].") ..() end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) diff --git a/maps/cyberiad.dmm b/maps/cyberiad.dmm index d6e8c0595fd..9050acacb72 100644 --- a/maps/cyberiad.dmm +++ b/maps/cyberiad.dmm @@ -8398,7 +8398,7 @@ "dfz" = (/turf/simulated/shuttle/plating{name = "Vox plating"; nitrogen = 100; oxygen = 0},/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/vox/station) "dfA" = (/obj/structure/closet{name = "Loot Closet"},/turf/simulated/shuttle/plating{name = "Vox plating"; nitrogen = 100; oxygen = 0},/area/shuttle/vox/station) "dfB" = (/turf/simulated/shuttle/plating{name = "Vox plating"; nitrogen = 100; oxygen = 0},/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/vox/station) -"dfC" = (/obj/effect/landmark/start,/obj/machinery/media/jukebox/lobby,/turf/unsimulated/floor,/area/start) +"dfC" = (/obj/effect/landmark/start,/turf/unsimulated/floor,/area/start) "dfD" = (/turf/unsimulated/wall/splashscreen,/area/start) "dfE" = (/obj/structure/table/reinforced,/obj/item/weapon/grenade/flashbang/clusterbang,/turf/simulated/floor/engine,/area/shuttle/gamma/space) "dfF" = (/obj/structure/table/reinforced,/obj/item/weapon/grenade/chem_grenade/incendiary{name = "Incendiary Grenade"},/obj/machinery/light{dir = 1},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/engine,/area/shuttle/gamma/space)