diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index aa253eb4fbb..87e04d5ae1e 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -53,7 +53,6 @@ suit_store = /obj/item/gun/energy/disabler backpack_contents = list( /obj/item/evidencebag = 1, - /obj/item/modular_computer/pda/warden = 1, /obj/item/flashlight/seclite = 1, /obj/item/storage/box/gunset/glock17 = 1, ) @@ -63,7 +62,7 @@ gloves = /obj/item/clothing/gloves/color/black/security //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/hats/warden //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/head/hats/warden/red shoes = /obj/item/clothing/shoes/jackboots/sec - l_pocket = /obj/item/restraints/handcuffs + l_pocket = /obj/item/modular_computer/pda/warden r_pocket = /obj/item/assembly/flash/handheld backpack = /obj/item/storage/backpack/security diff --git a/modular_zubbers/code/game/objects/items/holy_weapons.dm b/modular_zubbers/code/game/objects/items/holy_weapons.dm index 93e91e904c9..1a132fc55fd 100644 --- a/modular_zubbers/code/game/objects/items/holy_weapons.dm +++ b/modular_zubbers/code/game/objects/items/holy_weapons.dm @@ -3,6 +3,7 @@ desc = "A staff used by traditional bishops and popes." icon = 'modular_zubbers/icons/obj/items_and_weapons.dmi' icon_state = "papal_staff" + worn_icon_state = "nullrod" inhand_icon_state = "papal_staff" lefthand_file = 'modular_zubbers/icons/mob/inhands/weapons/melee_lefthand.dmi' righthand_file = 'modular_zubbers/icons/mob/inhands/weapons/melee_righthand.dmi' diff --git a/modular_zubbers/code/modules/status_indicators/status_indicator.dm b/modular_zubbers/code/modules/status_indicators/status_indicator.dm index 43e1319adb4..440c1d19a80 100644 --- a/modular_zubbers/code/modules/status_indicators/status_indicator.dm +++ b/modular_zubbers/code/modules/status_indicators/status_indicator.dm @@ -212,7 +212,7 @@ GLOBAL_LIST_INIT(potential_indicators, list( /atom/movable/screen/plane_master/game_world_upper_fov_hidden/status_indicator name = "Status Indicator Plane" documentation = "Status Indicator Plane" - plane = GAME_PLANE_UPPER_FOV_HIDDEN + plane = PLANE_STATUS_INDICATOR start_hidden = FALSE #undef STATUS_INDICATOR_Y_OFFSET