From bde0bce29ba63f6dea6033d0731b42ea466d22d2 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 28 Dec 2017 10:56:43 -0500 Subject: [PATCH] Fixes being able to adjust jumpsuits without an adjust state w/ chameleon & random jumpsuit --- code/game/machinery/vending.dm | 16 ++++++++-------- code/game/objects/items/devices/flashlight.dm | 2 +- code/game/objects/structures/bedsheet_bin.dm | 2 +- code/game/objects/structures/manned_turret.dm | 8 ++++---- code/modules/clothing/chameleon.dm | 1 + code/modules/clothing/gloves/color.dm | 10 +++------- code/modules/clothing/under/color.dm | 10 ++++------ 7 files changed, 22 insertions(+), 27 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index d3598d48668e..1d0228d73779 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -684,10 +684,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C desc = "Uh oh!" /obj/machinery/vending/snack/random/Initialize() - ..() - var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random) - new T(get_turf(src)) - return INITIALIZE_HINT_QDEL + ..() + var/T = pick(subtypesof(/obj/machinery/vending/snack) - /obj/machinery/vending/snack/random) + new T(loc) + return INITIALIZE_HINT_QDEL /obj/machinery/vending/snack/blue icon_state = "snackblue" @@ -737,10 +737,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C desc = "Uh oh!" /obj/machinery/vending/cola/random/Initialize() - . = ..() - var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random) - new T(get_turf(src)) - return INITIALIZE_HINT_QDEL + ..() + var/T = pick(subtypesof(/obj/machinery/vending/cola) - /obj/machinery/vending/cola/random) + new T(loc) + return INITIALIZE_HINT_QDEL /obj/machinery/vending/cola/blue icon_state = "Cola_Machine" diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 739ea246b7ce..7fc8df79ee81 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -493,7 +493,7 @@ color = null /obj/item/device/flashlight/glowstick/random/Initialize() - . = ..() + ..() var/T = pick(typesof(/obj/item/device/flashlight/glowstick) - /obj/item/device/flashlight/glowstick/random) new T(loc) return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index aa9acae22c8e..e97aedaf9885 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -231,10 +231,10 @@ LINEN BINS desc = "If you're reading this description ingame, something has gone wrong! Honk!" /obj/item/bedsheet/random/Initialize() - . = INITIALIZE_HINT_QDEL ..() var/type = pick(typesof(/obj/item/bedsheet) - /obj/item/bedsheet/random) new type(loc) + return INITIALIZE_HINT_QDEL /obj/structure/bedsheetbin name = "linen bin" diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm index f0a83cc70e2e..d21379cb448e 100644 --- a/code/game/objects/structures/manned_turret.dm +++ b/code/game/objects/structures/manned_turret.dm @@ -184,10 +184,10 @@ var/obj/machinery/manned_turret/turret /obj/item/gun_control/Initialize() - . = ..() - turret = loc - if(!istype(turret)) - return INITIALIZE_HINT_QDEL + . = ..() + turret = loc + if(!istype(turret)) + return INITIALIZE_HINT_QDEL /obj/item/gun_control/Destroy() turret = null diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 80195f6e3990..b90d68d1f604 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -206,6 +206,7 @@ sensor_mode = SENSOR_OFF //Hey who's this guy on the Syndicate Shuttle?? random_sensor = FALSE resistance_flags = NONE + can_adjust = FALSE armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50) var/datum/action/item_action/chameleon/change/chameleon_action diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 249cd6a1d9a9..714704ff22e1 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -192,7 +192,7 @@ item_state = "wgloves" item_color = "mime" -/obj/item/clothing/gloves/color/random/New() +/obj/item/clothing/gloves/color/random/Initialize() ..() var/list/gloves = list( /obj/item/clothing/gloves/color/orange = 1, @@ -205,9 +205,5 @@ /obj/item/clothing/gloves/color/brown = 1) var/obj/item/clothing/gloves/color/selected = pick(gloves) - - name = initial(selected.name) - desc = initial(selected.desc) - icon_state = initial(selected.icon_state) - item_state = initial(selected.item_state) - item_color = initial(selected.item_color) + new selected(loc) + return INITIALIZE_HINT_QDEL diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 2ff546a6ebf2..4ccfd44b17e3 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -4,13 +4,11 @@ /obj/item/clothing/under/color/random icon_state = "random_jumpsuit" -/obj/item/clothing/under/color/random/New() +/obj/item/clothing/under/color/random/Initialize() ..() - var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - /obj/item/clothing/under/color/random) - name = initial(C.name) - icon_state = initial(C.icon_state) - item_state = initial(C.item_state) - item_color = initial(C.item_color) + var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/glorf - /obj/item/clothing/under/color/black/ghost) + new C(loc) + return INITIALIZE_HINT_QDEL /obj/item/clothing/under/color/black name = "black jumpsuit"