Resolve Build issues and logic conflicts from Rodent merge

code/modules/cargo/packs/security.dm

@@ -65,8 +65,7 @@
 	cost = CARGO_CRATE_VALUE * 2
 	contains = list(/obj/item/clothing/head/helmet/sec = 3)
 	crate_name = "helmet crate"
-*/
-// SKYRAT EDIT REMOVAL END
+
 /datum/supply_pack/security/laser
 	name = "Lasers Crate"
 	desc = "Contains three lethal, high-energy laser guns."
@@ -74,6 +73,8 @@
 	access_view = ACCESS_ARMORY
 	contains = list(/obj/item/gun/energy/laser = 3)
 	crate_name = "laser crate"
+*/
+// SKYRAT EDIT REMOVAL END
 
 /datum/supply_pack/security/securitybarriers
 	name = "Security Barrier Grenades"
@@ -234,7 +235,7 @@
 	cost = CARGO_CRATE_VALUE * 5
 	contains = list(/obj/item/gun/energy/e_gun/dragnet = 3)
 	crate_name = "\improper DRAGnet crate"
-	
+
 // SKYRAT EDIT REMOVAL BEGIN - CARGO ARMAMENTS
 /*
 /datum/supply_pack/security/armory/energy
@@ -245,6 +246,8 @@
 	contains = list(/obj/item/gun/energy/e_gun = 2)
 	crate_name = "energy gun crate"
 	crate_type = /obj/structure/closet/crate/secure/plasma
+*/
+// SKYRAT EDIT REMOVAL END
 
 /datum/supply_pack/security/armory/exileimp
 	name = "Exile Implants Crate"

modular_skyrat/master_files/code/datums/traits/negative.dm

@@ -56,6 +56,7 @@
 	mob_trait = TRAIT_NOGUNS
 	icon = FA_ICON_GUN
 
+//BUBBER EDIT MOVE BEGIN - NEGATIVE SENSITIVE SNOUT
 /datum/quirk/sensitivesnout
 	name = "Sensitive Snout"
 	desc = "Your snout has always been sensitive, and it really hurts when someone pokes it!"
@@ -79,3 +80,4 @@
 
 /datum/status_effect/sensitivesnout/get_examine_text()
 	return span_warning("[owner.p_their(TRUE)] snout is rather bappable...")
+// BUBBER EDIT MOVE END

modular_skyrat/master_files/code/datums/traits/neutral.dm

@@ -206,7 +206,7 @@
 	value = 0
 	mob_trait = TRAIT_SENSITIVESNOUT
 	icon = FA_ICON_FINGERPRINT
-*/ BUBBER EDIT MOVE END
+*/ // BUBBER EDIT MOVE END
 
 /datum/quirk/overweight
 	name = "Overweight"

modular_zubbers/code/modules/loadouts/loadout_items/loadout_datum_under.dm

@@ -12,7 +12,7 @@
 	name = "Urban camouflage BDU"
 	item_path = /obj/item/clothing/under/rank/security/officer/hecu
 	donator_only = TRUE
-	restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_MEDIC, JOB_CORRECTIONS_OFFICER)
+	restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER)
 
 /datum/loadout_item/under/formal/lace_dress
 	name = "Lilac Dress"