Skip to content

Commit

Permalink
Revert clown and mime swap + ghost visibility
Browse files Browse the repository at this point in the history
  • Loading branch information
AyIong committed Apr 1, 2024
1 parent 3d727e7 commit 55f7983
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions code/game/jobs/job/support.dm
Original file line number Diff line number Diff line change
Expand Up @@ -319,15 +319,15 @@
satchel = /obj/item/storage/backpack/satchel/clown
dufflebag = /obj/item/storage/backpack/duffel/clown

/datum/outfit/job/mime/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/datum/outfit/job/clown/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(HAS_TRAIT(SSstation, STATION_TRAIT_BANANIUM_SHIPMENTS))
backpack_contents += /obj/item/stack/sheet/mineral/bananium/fifty
if(H.gender == FEMALE)
mask = /obj/item/clothing/mask/gas/clown_hat/sexy
uniform = /obj/item/clothing/under/rank/civilian/clown/sexy

/datum/outfit/job/mime/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/datum/outfit/job/clown/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
Expand Down Expand Up @@ -407,15 +407,15 @@
backpack = /obj/item/storage/backpack/mime
satchel = /obj/item/storage/backpack/mime

/datum/outfit/job/clown/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/datum/outfit/job/mime/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(HAS_TRAIT(SSstation, STATION_TRAIT_TRANQUILITE_SHIPMENTS))
backpack_contents += /obj/item/stack/sheet/mineral/tranquillite/fifty
if(H.gender == FEMALE)
uniform = /obj/item/clothing/under/rank/civilian/mime/sexy
suit = /obj/item/clothing/mask/gas/sexymime

/datum/outfit/job/clown/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/datum/outfit/job/mime/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/dead/observer/observer_base.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

GLOBAL_LIST_EMPTY(ghost_images)

GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_MINIMUM)
GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)

GLOBAL_DATUM_INIT(ghost_crew_monitor, /datum/ui_module/crew_monitor/ghost, new)

Expand All @@ -18,7 +18,7 @@ GLOBAL_DATUM_INIT(ghost_crew_monitor, /datum/ui_module/crew_monitor/ghost, new)
density = FALSE
alpha = 127
move_resist = INFINITY // don't get pushed around
invisibility = INVISIBILITY_MINIMUM
invisibility = INVISIBILITY_OBSERVER
blocks_emissive = FALSE // Ghosts are transparent, duh
var/can_reenter_corpse
var/bootime = FALSE
Expand Down

0 comments on commit 55f7983

Please sign in to comment.