diff --git a/code/datums/outfits/outfit_antag.dm b/code/datums/outfits/outfit_antag.dm index 898f925d594..d0e162a6baf 100644 --- a/code/datums/outfits/outfit_antag.dm +++ b/code/datums/outfits/outfit_antag.dm @@ -506,7 +506,7 @@ uniform = /obj/item/clothing/under/chameleon/wizard back = /obj/item/storage/backpack/chameleon/wizard suit = /obj/item/clothing/suit/chameleon/wizard - head = /obj/item/clothing/head/softcap/chameleon/wizard + head = /obj/item/clothing/head/chameleon/wizard shoes = /obj/item/clothing/shoes/chameleon/wizard l_ear = /obj/item/device/radio/headset/bluespace r_pocket = /obj/item/teleportation_scroll diff --git a/code/datums/trading/goods.dm b/code/datums/trading/goods.dm index 913d6a44a56..1b9ebee10a8 100644 --- a/code/datums/trading/goods.dm +++ b/code/datums/trading/goods.dm @@ -190,7 +190,7 @@ /obj/item/clothing/head/bomb_hood = TRADER_BLACKLIST_ALL, /obj/item/clothing/head/caphat = TRADER_BLACKLIST_ALL, /obj/item/clothing/head/centhat = TRADER_BLACKLIST, - /obj/item/clothing/head/softcap/chameleon = TRADER_BLACKLIST, + /obj/item/clothing/head/chameleon = TRADER_BLACKLIST, /obj/item/clothing/head/collectable = TRADER_BLACKLIST, /obj/item/clothing/head/culthood = TRADER_BLACKLIST_ALL, /obj/item/clothing/head/helmet = TRADER_BLACKLIST_ALL, diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index d630e4e3570..f02655c0796 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -123,7 +123,7 @@ desc = "Comes with all the clothes you need to impersonate most people. Acting lessons sold seperately." starts_with = list( /obj/item/clothing/under/chameleon = 1, - /obj/item/clothing/head/softcap/chameleon = 1, + /obj/item/clothing/head/chameleon = 1, /obj/item/clothing/suit/chameleon = 1, /obj/item/clothing/shoes/chameleon = 1, /obj/item/storage/backpack/chameleon = 1, diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 811f88e72bf..0d65db0ab38 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -960,11 +960,11 @@ /obj/item/clothing/gloves/chameleon = 1, /obj/item/clothing/gloves/black = 10, - /obj/item/clothing/head/softcap/chameleon = 0.5, + /obj/item/clothing/head/chameleon = 0.5, /obj/item/clothing/head/softcap = 5, /obj/item/clothing/mask/chameleon = 1, - /obj/item/clothing/mask/gas/ = 10, + /obj/item/clothing/mask/gas = 10, /obj/item/clothing/shoes/chameleon = 0.5, /obj/item/clothing/shoes/black = 5, @@ -979,7 +979,7 @@ /obj/item/gun/bang/deagle = 0.1, /obj/item/storage/backpack/chameleon = 1, - /obj/item/storage/backpack/ = 10, + /obj/item/storage/backpack = 10, /obj/item/clothing/glasses/chameleon = 1 diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 77375eb085f..bbea9f1284c 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -103,27 +103,27 @@ //**Chameleon Hat** //***************** -/obj/item/clothing/head/softcap/chameleon +/obj/item/clothing/head/chameleon name = "grey cap" desc = "It looks like a plain hat, but upon closer inspection, there's an advanced holographic array installed inside. It seems to have a small dial inside." origin_tech = list(TECH_ILLEGAL = 3) body_parts_covered = 0 var/global/list/clothing_choices -/obj/item/clothing/head/softcap/chameleon/Initialize() +/obj/item/clothing/head/chameleon/Initialize() . = ..() if(!clothing_choices) var/blocked = list(src.type, /obj/item/clothing/head/justice,)//Prevent infinite loops and bad hats. clothing_choices = generate_chameleon_choices(/obj/item/clothing/head, blocked) -/obj/item/clothing/head/softcap/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP. In this case your cover's blown. +/obj/item/clothing/head/chameleon/emp_act(severity) //Because we don't have psych for all slots right now but still want a downside to EMP. In this case your cover's blown. name = initial(name) desc = "It's a baseball hat in a tasteful grey colour." icon_state = initial(icon_state) update_icon() update_clothing_icon() -/obj/item/clothing/head/softcap/chameleon/verb/change(picked in clothing_choices) +/obj/item/clothing/head/chameleon/verb/change(picked in clothing_choices) set name = "Change Hat/Helmet Appearance" set category = "Chameleon Items" set src in usr @@ -134,14 +134,14 @@ disguise(clothing_choices[picked]) update_clothing_icon() //so our overlays update. -/obj/item/clothing/head/softcap/chameleon/wizard +/obj/item/clothing/head/chameleon/wizard wizard_garb = TRUE -/obj/item/clothing/head/softcap/chameleon/wizard/Initialize() +/obj/item/clothing/head/chameleon/wizard/Initialize() . = ..() disguise(/obj/item/clothing/head/wizard) -/obj/item/clothing/head/softcap/chameleon/wizard/change(picked in clothing_choices) +/obj/item/clothing/head/chameleon/wizard/change(picked in clothing_choices) set name = "Change Hat/Helmet Appearance" set category = "Chameleon Items" set src in usr @@ -153,7 +153,7 @@ return to_chat(usr, SPAN_WARNING("You touch \the [src], but nothing happens.")) -/obj/item/clothing/head/softcap/chameleon/wizard/emp_act() +/obj/item/clothing/head/chameleon/wizard/emp_act() return //****************** diff --git a/html/changelogs/alberyk-chameleonhatfix.yml b/html/changelogs/alberyk-chameleonhatfix.yml new file mode 100644 index 00000000000..b9ec4d00cd9 --- /dev/null +++ b/html/changelogs/alberyk-chameleonhatfix.yml @@ -0,0 +1,7 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed the chameleon hat behaving like a softcap." + - bugfix: "The wizard chameleon now has a proper icon."