From 41d4c2eb130801febe13835ea5073d2d45ceb8d2 Mon Sep 17 00:00:00 2001 From: Atlantis Date: Sun, 7 Jun 2015 06:26:10 +0200 Subject: [PATCH 1/4] Refactors /obj/item/apc_frame to /obj/item/frame/apc - This fixes broken APC frame placement on walls - #9537 --- code/game/objects/items/apc_frame.dm | 6 +++--- code/modules/materials/material_recipes.dm | 2 +- code/modules/power/apc.dm | 6 +++--- maps/exodus-1.dmm | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index 0f3fdde0d8..5847201cde 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -1,19 +1,19 @@ // APC HULL -/obj/item/apc_frame +/obj/item/frame/apc name = "\improper APC frame" desc = "Used for repairing or building APCs" icon = 'icons/obj/apc_repair.dmi' icon_state = "apc_frame" flags = CONDUCT -/obj/item/apc_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/frame/apc/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/material/steel( get_turf(src.loc), 2 ) qdel(src) -/obj/item/apc_frame/proc/try_build(turf/on_wall) +/obj/item/frame/apc/try_build(turf/on_wall) if (get_dist(on_wall,usr)>1) return var/ndir = get_dir(usr,on_wall) diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm index dd325942a0..c24490d6db 100644 --- a/code/modules/materials/material_recipes.dm +++ b/code/modules/materials/material_recipes.dm @@ -74,7 +74,7 @@ recipes += new/datum/stack_recipe("grenade casing", /obj/item/weapon/grenade/chem_grenade) recipes += new/datum/stack_recipe("light fixture frame", /obj/item/frame/light, 2) recipes += new/datum/stack_recipe("small light fixture frame", /obj/item/frame/light/small, 1) - recipes += new/datum/stack_recipe("apc frame", /obj/item/apc_frame, 2) + recipes += new/datum/stack_recipe("apc frame", /obj/item/frame/apc, 2) recipes += new/datum/stack_recipe("air alarm frame", /obj/item/frame/air_alarm, 2) recipes += new/datum/stack_recipe("fire alarm frame", /obj/item/frame/fire_alarm, 2) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 21f0f6c1a5..8b6771dff3 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -596,14 +596,14 @@ "You disassembled the broken APC frame.",\ "You hear welding.") else - new /obj/item/apc_frame(loc) + new /obj/item/frame/apc(loc) user.visible_message(\ "[src] has been cut from the wall by [user.name] with the weldingtool.",\ "You cut the APC frame from the wall.",\ "You hear welding.") qdel(src) return - else if (istype(W, /obj/item/apc_frame) && opened && emagged) + else if (istype(W, /obj/item/frame/apc) && opened && emagged) emagged = 0 if (opened==2) opened = 1 @@ -612,7 +612,7 @@ "You replace the damaged APC frontal panel with a new one.") qdel(W) update_icon() - else if (istype(W, /obj/item/apc_frame) && opened && ((stat & BROKEN) || hacker)) + else if (istype(W, /obj/item/frame/apc) && opened && ((stat & BROKEN) || hacker)) if (has_electronics) user << "You cannot repair this APC until you remove the electronics still inside." return diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm index 2b5f781cfb..87db354411 100644 --- a/maps/exodus-1.dmm +++ b/maps/exodus-1.dmm @@ -4249,7 +4249,7 @@ "bDK" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/airlock/glass_medical{id_tag = "GeneticsDoor"; name = "Genetics Laboratory"; req_access = list(9)},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay2) "bDL" = (/turf/simulated/floor{icon_state = "white"},/area/medical/genetics_cloning) "bDM" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics_cloning) -"bDN" = (/obj/item/apc_frame,/obj/effect/decal/cleanable/dirt,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/medical/genetics) +"bDN" = (/obj/item/frame/apc,/obj/effect/decal/cleanable/dirt,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/plating,/area/medical/genetics) "bDO" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/medical/genetics) "bDP" = (/obj/machinery/door/firedoor,/obj/machinery/door/blast/shutters{density = 0; dir = 2; icon_state = "shutter0"; id = "acute1"; name = "EMT Storage Privacy Shutters"; opacity = 0},/obj/machinery/light_switch{pixel_x = 22; pixel_y = 0},/turf/simulated/floor{tag = "icon-whitebluefull"; icon_state = "whitebluefull"},/area/medical/sleeper) "bDQ" = (/obj/structure/table/standard,/obj/item/device/mmi,/obj/item/device/mmi,/obj/item/device/mmi,/turf/simulated/floor,/area/assembly/robotics) From 9f93abbaf3e32dccbef8fbc2fedb2612985192a0 Mon Sep 17 00:00:00 2001 From: Techhead0 Date: Sun, 7 Jun 2015 12:31:55 -0400 Subject: [PATCH 2/4] Removes Beehive and Pompadours from Unathi hairstyles. As per Unathi Loremaster Ikky's request. Tested to not corrupt savefiles. --- code/modules/mob/new_player/sprite_accessories.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index 240093fec9..37f0f29803 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -136,7 +136,6 @@ name = "Pompadour" icon_state = "hair_pompadour" gender = MALE - species_allowed = list("Human","Unathi") quiff name = "Quiff" @@ -159,7 +158,6 @@ name = "Beehive" icon_state = "hair_beehive" gender = FEMALE - species_allowed = list("Human","Unathi") beehive2 name = "Beehive 2" From ccb01cd4eddeec6d93dba16eae7e37a58132e817 Mon Sep 17 00:00:00 2001 From: zonthori Date: Sun, 7 Jun 2015 13:38:44 -0600 Subject: [PATCH 3/4] Fixes https://github.com/Baystation12/Baystation12/issues/9728 Fixes custom welding helmet sprites to break when toggled. https://github.com/Baystation12/Baystation12/issues/9728 --- code/modules/clothing/head/misc_special.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 1a0052d316..6f4e9b9a93 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -25,8 +25,11 @@ icon_action_button = "action_welding" siemens_coefficient = 0.9 w_class = 3 + var/base_state /obj/item/clothing/head/welding/attack_self() + if(!base_state) + base_state = icon_state toggle() @@ -40,13 +43,13 @@ src.up = !src.up src.flags |= (HEADCOVERSEYES | HEADCOVERSMOUTH) flags_inv |= (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) - icon_state = initial(icon_state) + icon_state = "[base_state]" usr << "You flip the [src] down to protect your eyes." else src.up = !src.up src.flags &= ~(HEADCOVERSEYES | HEADCOVERSMOUTH) flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) - icon_state = "[initial(icon_state)]up" + icon_state = "[base_state]up" usr << "You push the [src] up out of your face." update_clothing_icon() //so our mob-overlays update From 98ca5466e2c401a61dd341349fab24efe1bd6191 Mon Sep 17 00:00:00 2001 From: zonthori Date: Sun, 7 Jun 2015 13:56:11 -0600 Subject: [PATCH 4/4] Straight base_state --- code/modules/clothing/head/misc_special.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 6f4e9b9a93..5b3485186f 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -43,7 +43,7 @@ src.up = !src.up src.flags |= (HEADCOVERSEYES | HEADCOVERSMOUTH) flags_inv |= (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) - icon_state = "[base_state]" + icon_state = base_state usr << "You flip the [src] down to protect your eyes." else src.up = !src.up