Skip to content

Commit

Permalink
add/refactor: Chameleon Rework (#5065)
Browse files Browse the repository at this point in the history
Chameleon Rework
  • Loading branch information
Gottfrei authored Jun 19, 2024
1 parent 336364b commit 89bae08
Show file tree
Hide file tree
Showing 11 changed files with 922 additions and 703 deletions.
8 changes: 8 additions & 0 deletions code/datums/outfits/outfit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,14 @@
H.regenerate_icons()
return TRUE


/datum/outfit/proc/get_chameleon_disguise_info()
var/list/types = list(uniform, suit, back, belt, gloves, shoes, head, mask, neck, l_ear, r_ear, glasses, id, l_pocket, r_pocket, suit_store, r_hand, l_hand, pda)
types += chameleon_extras
listclearnulls(types)
return types


/datum/outfit/proc/apply_fingerprints(mob/living/carbon/human/H)
if(!istype(H))
return
Expand Down
12 changes: 7 additions & 5 deletions code/game/jobs/job/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -285,13 +285,15 @@
PDA.ownrank = C.rank
PDA.name = "PDA-[H.real_name] ([PDA.ownjob])"

/datum/outfit/job/proc/get_chameleon_disguise_info()
var/on_back = (allow_backbag_choice) ? backpack : back
var/list/types = list(uniform, suit, on_back, belt, gloves, shoes, head, mask, neck, l_ear, r_ear, glasses, id, l_pocket, r_pocket, suit_store, r_hand, l_hand, pda)
types += chameleon_extras
listclearnulls(types)

/datum/outfit/job/get_chameleon_disguise_info()
var/list/types = ..()
if(allow_backbag_choice && backpack)
types -= back
types += backpack
return types


/datum/job/proc/would_accept_job_transfer_from_player(mob/player)
if(!transfer_allowed)
return FALSE
Expand Down
7 changes: 6 additions & 1 deletion code/game/objects/items/devices/voice.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,19 @@

/obj/item/voice_changer/attack_self(mob/user)
active = !active
icon_state = "voice_changer_[active ? "on" : "off"]"
update_icon(UPDATE_ICON_STATE)
if(inform_about_toggle)
to_chat(user, span_notice("You toggle [src] [active ? "on" : "off"]."))

for(var/X in actions)
var/datum/action/A = X
A.UpdateButtonIcon()


/obj/item/voice_changer/update_icon_state()
icon_state = "voice_changer_[active ? "on" : "off"]"


/obj/item/voice_changer/proc/set_voice(mob/user)
var/mimic_voice
var/mimic_voice_tts
Expand Down
Loading

0 comments on commit 89bae08

Please sign in to comment.