diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 3e19f0bf..ff8faf2a 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -401,7 +401,7 @@
occupantData["structuralEnzymes"] = null
occupantData["radiationLevel"] = null
else
- occupantData["name"] = connected.occupant.name
+ occupantData["name"] = connected.occupant.real_name
occupantData["stat"] = connected.occupant.stat
occupantData["isViableSubject"] = 1
if (NOCLONE in connected.occupant.mutations || !src.connected.occupant.dna)
@@ -704,7 +704,7 @@
databuf.types = DNA2_BUF_UE
databuf.dna = src.connected.occupant.dna.Clone()
if(ishuman(connected.occupant))
- databuf.dna.real_name=connected.occupant.name
+ databuf.dna.real_name=connected.occupant.dna.real_name
databuf.name = "Unique Identifier"
src.buffers[bufferId] = databuf
return 1
@@ -715,7 +715,7 @@
databuf.types = DNA2_BUF_UI|DNA2_BUF_UE
databuf.dna = src.connected.occupant.dna.Clone()
if(ishuman(connected.occupant))
- databuf.dna.real_name=connected.occupant.name
+ databuf.dna.real_name=connected.occupant.dna.real_name
databuf.name = "Unique Identifier + Unique Enzymes"
src.buffers[bufferId] = databuf
return 1
@@ -726,7 +726,7 @@
databuf.types = DNA2_BUF_SE
databuf.dna = src.connected.occupant.dna.Clone()
if(ishuman(connected.occupant))
- databuf.dna.real_name=connected.occupant.name
+ databuf.dna.real_name=connected.occupant.dna.real_name
databuf.name = "Structural Enzymes"
src.buffers[bufferId] = databuf
return 1
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index 9c0856ae..53466e96 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -127,6 +127,7 @@
M.ExtinguishMob()
if(W.loc == my_target) break
sleep(2)
+ W.delete()
if((istype(usr.loc, /turf/space)) || (usr.lastarea.has_gravity == 0))
user.inertia_dir = get_dir(target, user)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 400f82aa..c9166528 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -388,7 +388,7 @@
shardtype = /obj/item/weapon/shard/plasma
health = 120
-/obj/structure/window/phoronbasic/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+/obj/structure/window/plasmabasic/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
if(exposed_temperature > T0C + 32000)
hit(round(exposed_volume / 1000), 0)
..()
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index ec023889..41eb32e2 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -461,4 +461,4 @@
return
/obj/item/weapon/paper/crumpled/bloody
- icon_state = "scrap_bloodied"
+ icon_state = "scrap_bloodied"
\ No newline at end of file
diff --git a/maps/tgstation2.dmm b/maps/tgstation2.dmm
index 56464a0d..79b4a72f 100644
--- a/maps/tgstation2.dmm
+++ b/maps/tgstation2.dmm
@@ -4232,7 +4232,7 @@
"bDt" = (/obj/machinery/sleeper{icon_state = "sleeper_0-r"; orient = "RIGHT"},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/medical/sleeper)
"bDu" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 10; icon_state = "warning"},/area/medical/medbay2)
"bDv" = (/obj/structure/table,/obj/item/weapon/crowbar,/obj/item/weapon/wrench,/obj/item/weapon/reagent_containers/spray,/turf/simulated/floor{icon_state = "warning"},/area/medical/medbay2)
-"bDw" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 0; pixel_y = 0},/turf/simulated/floor{icon_state = "warning"},/area/medical/medbay2)
+"bDw" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 7; pixel_y = 1},/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{pixel_x = 0; pixel_y = 0},/obj/item/weapon/melee/defibrillator,/turf/simulated/floor{icon_state = "warning"},/area/medical/medbay2)
"bDx" = (/obj/structure/closet/secure_closet/medical1,/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/medical/medbay2)
"bDy" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bDz" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/machinery/camera{c_tag = "Cloning Lab"; dir = 1; network = list("SS13","Medical")},/obj/machinery/dna_scannernew,/turf/simulated/floor{dir = 10; icon_state = "whiteblue"},/area/medical/genetics_cloning)
@@ -4844,7 +4844,7 @@
"bPh" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/weapon/folder/white,/obj/item/weapon/hand_labeler,/obj/item/weapon/gun/syringe,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bPi" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bPj" = (/obj/structure/table,/obj/item/weapon/storage/box/bodybags{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/box/rxglasses,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/camera{c_tag = "Medbay Storage"; dir = 1; network = list("SS13","Medical"); pixel_x = 22},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
-"bPk" = (/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = -1; pixel_y = -1; pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
+"bPk" = (/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = -1; pixel_y = -1; pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/obj/item/weapon/melee/defibrillator,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bPl" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bPm" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
"bPn" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2)
diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl
index 088f1cec..3a2dff64 100644
--- a/nano/templates/pda.tmpl
+++ b/nano/templates/pda.tmpl
@@ -380,10 +380,10 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm
{{:~string('{1}%', aircontents.carbon_dioxide > 5 ? 'bad' : 'good' , aircontents.carbon_dioxide)}}
- Phoron:
+ Plasma:
- {{:~string('{1}%', aircontents.phoron > 0 ? 'bad' : 'good' , aircontents.phoron)}}
+ {{:~string('{1}%', aircontents.plasma > 0 ? 'bad' : 'good' , aircontents.plasma)}}
{{if aircontents.other > 0}}