cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 07:59:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the wizard chameleon hat (#11457)

Browse Source
This commit is contained in:
Alberyk
2021-03-16 15:34:58 +01:00
committed by GitHub
parent c693fa3437
commit 25fd4afd96
6 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/outfits/outfit_antag.dm
+1 -1
View File
@@ -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
code/datums/trading/goods.dm
+1 -1
View File
@@ -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,
code/game/objects/items/weapons/storage/uplink_kits.dm
+1 -1
View File
@@ -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,
code/game/objects/random/random.dm
+3 -3
View File
@@ -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
code/modules/clothing/chameleon.dm
+8 -8
View File
@@ -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
//******************
html/changelogs/alberyk-chameleonhatfix.yml
+7
View File
@@ -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."