Revert "Merge pull request #197 from NullDagaf/cummenfarten"

This reverts commit 05867699c5, reversing
changes made to e7eb758cb6.

code/game/objects/items/melee/baton.dm

@@ -420,7 +420,7 @@
 			log_mapping("[src] at [AREACOORD(src)] had an invalid preload_cell_type: [preload_cell_type].")
 		else
 			cell = new preload_cell_type(src)
-	RegisterSignal(src, COMSIG_PARENT_ATTACKBY, PROC_REF(convert))
+	RegisterSignal(src, COMSIG_PARENT_ATTACKBY, .proc/convert)
 	update_appearance()
 
 /obj/item/melee/baton/security/get_cell()
@@ -574,7 +574,7 @@
 	target.set_timed_status_effect(16 SECONDS, /datum/status_effect/speech/stutter, only_if_higher = TRUE)
 
 	SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK)
-	addtimer(CALLBACK(src, PROC_REF(apply_stun_effect_end), target), 2 SECONDS)
+	addtimer(CALLBACK(src, .proc/apply_stun_effect_end, target), 2 SECONDS)
 
 /// After the initial stun period, we check to see if the target needs to have the stun applied.
 /obj/item/melee/baton/security/proc/apply_stun_effect_end(mob/living/target)
@@ -615,7 +615,7 @@
 		scramble_mode()
 		for(var/loops in 1 to rand(6, 12))
 			scramble_time = rand(5, 15) / (1 SECONDS)
-			addtimer(CALLBACK(src, PROC_REF(scramble_mode)), scramble_time*loops * (1 SECONDS))
+			addtimer(CALLBACK(src, .proc/scramble_mode), scramble_time*loops * (1 SECONDS))
 
 /obj/item/melee/baton/security/proc/scramble_mode()
 	if (!cell || cell.charge < cell_hit_cost)

code/modules/jobs/job_types/warden.dm

@@ -53,6 +53,7 @@
 	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,
 		)
@@ -62,7 +63,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/modular_computer/pda/warden
+	l_pocket = /obj/item/restraints/handcuffs
 	r_pocket = /obj/item/assembly/flash/handheld
 
 	backpack = /obj/item/storage/backpack/security

modular_zubbers/code/game/objects/items/holy_weapons.dm

@@ -3,7 +3,6 @@
 	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'

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 = PLANE_STATUS_INDICATOR
+	plane = GAME_PLANE_UPPER_FOV_HIDDEN
 	start_hidden = FALSE
 
 #undef STATUS_INDICATOR_Y_OFFSET