some changes

_maps/map_files/IceMeta_drip/IceMeta_drip.dmm

@@ -1788,6 +1788,9 @@
 	pixel_y = 28
 	},
 /obj/structure/closet/secure_closet/evidence,
+/obj/machinery/camera{
+	c_tag = "Evidence Storage"
+	},
 /turf/open/floor/plasteel/dark,
 /area/security/warden)
 "aAS" = (
@@ -4291,7 +4294,7 @@
 /area/medical/sleeper)
 "bhX" = (
 /obj/machinery/camera{
-	c_tag = "Brig - Desk";
+	c_tag = "Magistrate`s Office";
 	dir = 8
 	},
 /obj/machinery/computer/med_data{
@@ -10285,8 +10288,7 @@
 /turf/open/floor/plasteel,
 /area/engine/engineering)
 "cUZ" = (
-/obj/structure/closet/secure_closet/security/sec,
-/obj/effect/turf_decal/bot_red,
+/obj/machinery/vending/wardrobe/sec_wardrobe,
 /turf/open/floor/plasteel{
 	icon_state = "darkred";
 	dir = 4
@@ -12719,6 +12721,9 @@
 	pixel_x = 0;
 	pixel_y = 21
 	},
+/obj/machinery/camera{
+	c_tag = "Brig Checkpoint"
+	},
 /turf/open/floor/plasteel/dark/side{
 	icon_state = "textured_dark_corner"
 	},
@@ -15233,6 +15238,10 @@
 	dir = 4;
 	pixel_x = -24
 	},
+/obj/machinery/camera{
+	c_tag = "Nanotrasen representative`s Office";
+	dir = 4
+	},
 /turf/open/floor/plasteel{
 	icon_state = "darkbrown";
 	dir = 2
@@ -18763,7 +18772,7 @@
 	pixel_x = 27
 	},
 /obj/machinery/camera{
-	c_tag = "Security - Office - Starboard";
+	c_tag = "Security - Office - Ssssssstarboard";
 	dir = 8
 	},
 /turf/open/floor/plasteel{
@@ -20503,6 +20512,10 @@
 	dir = 8;
 	color = "#ff0000"
 	},
+/obj/item/ammo_box/magazine/wt550m9/wtr,
+/obj/item/ammo_box/magazine/wt550m9/wtr,
+/obj/item/ammo_box/magazine/wt550m9/wtr,
+/obj/item/ammo_box/magazine/wt550m9/wtr,
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/security/armory)
 "fPq" = (
@@ -22353,7 +22366,7 @@
 "gmV" = (
 /obj/effect/turf_decal/bot_red,
 /obj/structure/closet{
-	name = "Evidence Closet 5"
+	name = "Evidence Closet"
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/warden)
@@ -35783,7 +35796,25 @@
 /area/maintenance/port/aft)
 "jOc" = (
 /obj/effect/turf_decal/bot_red,
-/obj/machinery/suit_storage_unit/warden,
+/obj/structure/rack,
+/obj/item/clothing/mask/gas/sechailer{
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/item/clothing/mask/gas/sechailer{
+	pixel_x = 1;
+	pixel_y = -1
+	},
+/obj/item/clothing/mask/gas/sechailer{
+	pixel_x = 2;
+	pixel_y = -4
+	},
+/obj/item/assembly/flash/handheld,
+/obj/item/assembly/flash/handheld,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/reagent_containers/spray/pepper,
+/obj/item/clothing/glasses/hud/security/ballistic,
+/obj/item/clothing/glasses/hud/security/ballistic,
 /turf/open/floor/plasteel/dark/side{
 	icon_state = "textured_dark_corner";
 	dir = 1
@@ -40931,11 +40962,12 @@
 	},
 /area/hydroponics)
 "lkw" = (
-/obj/machinery/vending/security,
 /obj/machinery/firealarm{
 	dir = 8;
 	pixel_x = 26
 	},
+/obj/effect/turf_decal/bot_red,
+/obj/structure/closet/secure_closet/security/sec,
 /turf/open/floor/plasteel{
 	icon_state = "darkred";
 	dir = 4
@@ -54074,10 +54106,6 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/machinery/camera{
-	c_tag = "Evidence Storage"
-	},
-/obj/effect/landmark/blobstart,
 /turf/open/floor/plasteel/dark/side{
 	icon_state = "textured_dark_edge";
 	dir = 1
@@ -64505,7 +64533,7 @@
 	c_tag = "Security - Gear Room";
 	dir = 8
 	},
-/obj/machinery/vending/wardrobe/sec_wardrobe,
+/obj/machinery/armaments_dispenser,
 /turf/open/floor/plasteel{
 	icon_state = "darkred";
 	dir = 4
@@ -71798,6 +71826,10 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
+/obj/machinery/camera{
+	c_tag = "Blueshield`s Office";
+	dir = 8
+	},
 /turf/open/floor/plasteel{
 	icon_state = "darkbluecorners";
 	dir = 8
@@ -74444,7 +74476,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/machinery/armaments_dispenser,
+/obj/machinery/vending/security,
 /turf/open/floor/plasteel{
 	icon_state = "darkred";
 	dir = 4
@@ -76869,10 +76901,6 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = -27
 	},
-/obj/machinery/camera{
-	c_tag = "Security - Secure Gear Storage";
-	dir = 4
-	},
 /obj/effect/turf_decal/bot_red,
 /obj/structure/closet/secure_closet/evidence,
 /turf/open/floor/plasteel/dark,
@@ -77569,6 +77597,10 @@
 /obj/item/clothing/under/rank/security/navyblue,
 /obj/item/clothing/under/rank/security/navyblue,
 /obj/item/clothing/under/rank/security/navyblue,
+/obj/item/clothing/under/rank/security/head_of_security/navyblue,
+/obj/item/clothing/under/rank/security/warden/navyblue,
+/obj/item/radio/headset/headset_sec/alt,
+/obj/item/radio/headset/headset_sec/alt,
 /turf/open/floor/plasteel/dark/side{
 	icon_state = "textured_dark_corner";
 	dir = 8
@@ -77893,8 +77925,7 @@
 	max_integrity = 350;
 	color = "#ff0000"
 	},
-/obj/item/clothing/suit/armor/laserproof,
-/obj/item/clothing/head/helmet/laserproof,
+/obj/item/clothing/suit/hooded/ablative,
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/security/armory)
 "vhp" = (
@@ -78845,6 +78876,10 @@
 "vuQ" = (
 /obj/effect/turf_decal/bot_red,
 /obj/machinery/flasher/portable,
+/obj/machinery/camera{
+	c_tag = "Security - Secure Gear Storage";
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark/side{
 	icon_state = "textured_dark_edge";
 	dir = 8
@@ -84837,7 +84872,6 @@
 	},
 /area/engine/atmos/distro)
 "wWV" = (
-/obj/structure/rack,
 /obj/effect/turf_decal/bot_red,
 /obj/machinery/door/window/brigdoor{
 	dir = 4;
@@ -84857,18 +84891,9 @@
 	dir = 8;
 	color = "#ff0000"
 	},
-/obj/item/clothing/mask/gas/sechailer{
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/obj/item/clothing/mask/gas/sechailer{
-	pixel_x = 1;
-	pixel_y = -1
-	},
-/obj/item/clothing/mask/gas/sechailer{
-	pixel_x = 2;
-	pixel_y = -4
-	},
+/obj/structure/guncase/wt,
+/obj/item/gun/ballistic/automatic/wt550/armory,
+/obj/item/gun/ballistic/automatic/wt550/armory,
 /turf/open/floor/plasteel/dark,
 /area/ai_monitored/security/armory)
 "wXa" = (
@@ -89040,7 +89065,7 @@
 	dir = 8
 	},
 /obj/machinery/camera{
-	c_tag = "Security - Gear Room";
+	c_tag = "Security - Processing";
 	dir = 8
 	},
 /turf/open/floor/plasteel{

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -304,10 +304,12 @@
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "tac"
 
+/*Dripstation edit
 /obj/structure/closet/secure_closet/lethalshots/PopulateContents()
 	..()
 	for(var/i in 1 to 3)
 		new /obj/item/storage/box/lethalshot(src)
+*/
 
 //Yogs Start: Brig Pysh Closet
 /obj/structure/closet/secure_closet/physician

code/game/objects/structures/guncase.dm

@@ -113,3 +113,9 @@
 	icon_state = "ecase"
 	case_type = "egun"
 	gun_category = /obj/item/gun/energy/e_gun
+
+/obj/structure/guncase/wt
+	name = "security carbine locker"
+	desc = "A locker that holds WT 550."
+	case_type = "wtgun"
+	gun_category = /obj/item/gun/ballistic/automatic/wt550

modular_dripstation/code/game/objects/items/weaponry.dm

@@ -616,10 +616,12 @@
 	on_icon_state = "telecane_active"
 	off_icon_state = "telecane"
 	on_item_state = "telecane_active"
+	icon = 'modular_dripstation/icons/obj/weapons/melee.dmi'
 
 /obj/item/melee/hardlight_cane
 	icon_state = "holocane"
 	item_state = "holocane"
+	icon = 'modular_dripstation/icons/obj/weapons/melee.dmi'
 	force = 0
 	attack_verb = list("hit", "poked")
 

modular_dripstation/code/game/objects/structures/crates_lockers/closets.dm

@@ -88,6 +88,12 @@ GLOBAL_LIST_INIT(closet_cutting_types, typecacheof(list(
 /obj/structure/closet/secure_closet/lethalshots
 	icon_state = "armory"
 
+/obj/structure/closet/secure_closet/lethalshots/PopulateContents()
+	..()
+	for(var/i in 1 to 2)
+		new /obj/item/storage/box/lethalshot(src)
+		new /obj/item/storage/box/laserbuckshot(src)
+
 /obj/structure/closet/attackby(obj/item/attacking_item, mob/user, params)
 	if(user in src)
 		return
@@ -515,6 +521,7 @@ GLOBAL_LIST_INIT(closet_cutting_types, typecacheof(list(
 	new /obj/item/storage/box/flashbangs(src)
 	new /obj/item/flashlight/seclite(src)
 	new /obj/item/clothing/shoes/combat(src)
+	new /obj/item/gun/energy/e_gun/energyrevolver(src)
 	new /obj/item/storage/belt/military/assault/blueshield(src)
 	new /obj/item/radio/headset/blueshield(src)
 	new /obj/item/storage/backpack/blueshield(src)
@@ -538,6 +545,7 @@ GLOBAL_LIST_INIT(closet_cutting_types, typecacheof(list(
 	new /obj/item/clothing/glasses/hud/personnel(src)
 	new /obj/item/radio/headset/heads/ntrep(src)
 	new /obj/item/storage/bag/garment/ntrep(src)
+	new /obj/item/melee/ntrep_cane/loaded(src)
 	new /obj/item/clothing/shoes/laceup(src)
 	new /obj/item/taperecorder(src)
 	new /obj/item/tape(src)
@@ -564,7 +572,6 @@ GLOBAL_LIST_INIT(closet_cutting_types, typecacheof(list(
 	new /obj/item/clothing/accessory/lawyers_badge(src)
 	new /obj/item/radio/headset/heads/magistrate(src)
 	new /obj/item/clothing/glasses/hud/security(src)
-	new /obj/item/cane(src)
 	new /obj/item/megaphone(src)
 	new /obj/item/clipboard/yog/paperwork/security(src)
 	new /obj/item/storage/bag/garment/magistrate(src)

modular_dripstation/code/modules/clothing/armor.dm

@@ -208,8 +208,8 @@ obj/item/clothing/head/helmet/swat/nanotrasen
 
 /obj/item/clothing/head/hooded/ablative
 	name = "ablative hood"
-	icon = 'modular_dripstation/icons/obj/clothing/suits.dmi'
-	worn_icon = 'modular_dripstation/icons/mob/clothing/suits.dmi'
+	icon = 'modular_dripstation/icons/obj/clothing/hats.dmi'
+	worn_icon = 'modular_dripstation/icons/mob/clothing/hats.dmi'
 	desc = "Hood hopefully belonging to an ablative trenchcoat."
 	icon_state = "ablativehood"
 	item_state = "ablativehood"

modular_dripstation/code/modules/clothing/hardsuit.dm

@@ -562,3 +562,11 @@
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard
 	slowdown = 0
 	clothing_traits = list(TRAIT_ANTIMAGIC_NO_SELFBLOCK)
+
+/obj/item/clothing/head/helmet/space/hardsuit/cult
+	icon = 'icons/obj/clothing/hats/hats.dmi'
+	worn_icon = 'icons/mob/clothing/head/head.dmi'
+
+/obj/item/clothing/suit/space/hardsuit/cult
+	icon = 'icons/obj/clothing/suits/suits.dmi'
+	worn_icon = 'icons/mob/clothing/suit/suit.dmi'

modular_dripstation/code/modules/job/job_types/magistrate.dm

@@ -71,5 +71,5 @@
 	gloves = /obj/item/clothing/gloves/color/white
 	shoes = /obj/item/clothing/shoes/laceup
 	digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/command
-	backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
+	backpack_contents = list(/obj/item/melee/classic_baton/telescopic/cane=1)
 	implants = list(/obj/item/implant/mindshield/centcom)

modular_dripstation/code/modules/projectiles/guns/energy/energy_gun.dm

@@ -21,7 +21,7 @@
 	item_state = "gun"
 	ammo_x_offset = 2
 	force = 10
-	resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/electrode/spec, /obj/item/ammo_casing/energy/laser)
 
 /obj/item/gun/energy/e_gun/hos

modular_dripstation/code/modules/vending/security_armaments.dm

@@ -1,5 +1,7 @@
 /obj/machinery/armaments_dispenser
 	icon = 'modular_dripstation/icons/obj/vending.dmi'
+	contents = newlist(/obj/item/gun/energy/disabler/secure, 
+					   /obj/item/gun/ballistic/automatic/pistol/ntusp)
 
 /obj/machinery/armaments_dispenser/update_overlays()
 	. = ..()