[MIRROR] [MIRROR] some deathmatch fixes [MDB IGNORE]

_maps/deathmatch/OSHA_Violator.dmm

@@ -20,11 +20,18 @@
 /obj/structure/closet/secure_closet/engineering_welding,
 /turf/open/indestructible,
 /area/deathmatch)
+"cl" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/obj/structure/cable,
+/turf/open/indestructible,
+/area/deathmatch)
 "cA" = (
 /turf/open/indestructible,
 /area/deathmatch)
 "cR" = (
-/obj/machinery/field/generator/starts_on,
+/obj/machinery/field/generator/starts_on/magic,
 /obj/effect/turf_decal/bot,
 /obj/structure/cable,
 /turf/open/indestructible,
@@ -36,7 +43,7 @@
 "dt" = (
 /obj/machinery/light/no_nightlight/directional/north,
 /obj/effect/turf_decal/stripes/line,
-/obj/machinery/field/generator/starts_on,
+/obj/machinery/field/generator/starts_on/magic,
 /obj/structure/cable,
 /turf/open/indestructible,
 /area/deathmatch)
@@ -581,7 +588,7 @@
 /area/deathmatch)
 "Bv" = (
 /obj/effect/turf_decal/stripes/line,
-/obj/machinery/field/generator/starts_on,
+/obj/machinery/field/generator/starts_on/magic,
 /obj/structure/cable,
 /turf/open/indestructible,
 /area/deathmatch)
@@ -685,6 +692,13 @@
 /obj/machinery/light/no_nightlight/directional/west,
 /turf/open/indestructible,
 /area/deathmatch)
+"Gw" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/structure/cable,
+/turf/open/indestructible,
+/area/deathmatch)
 "Gx" = (
 /obj/machinery/conveyor/auto,
 /obj/structure/cable,
@@ -849,7 +863,7 @@
 /turf/open/indestructible,
 /area/deathmatch)
 "Pg" = (
-/obj/machinery/field/generator/starts_on,
+/obj/machinery/field/generator,
 /obj/machinery/light/no_nightlight/directional/north,
 /turf/open/indestructible,
 /area/deathmatch)
@@ -980,7 +994,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/machinery/field/generator/starts_on,
+/obj/machinery/field/generator/starts_on/magic,
 /obj/structure/cable,
 /turf/open/indestructible,
 /area/deathmatch)
@@ -1042,8 +1056,11 @@
 /turf/open/indestructible,
 /area/deathmatch)
 "YA" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
 /obj/structure/cable,
-/turf/closed/indestructible/fakeglass,
+/turf/open/indestructible,
 /area/deathmatch)
 "YJ" = (
 /obj/structure/cable,
@@ -1062,7 +1079,7 @@
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
-/obj/machinery/field/generator/starts_on,
+/obj/machinery/field/generator/starts_on/magic,
 /obj/structure/cable,
 /turf/open/indestructible,
 /area/deathmatch)
@@ -1073,6 +1090,12 @@
 	},
 /turf/open/indestructible,
 /area/deathmatch)
+"Zq" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/indestructible,
+/area/deathmatch)
 "Zr" = (
 /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle,
 /turf/open/space/basic,
@@ -1387,7 +1410,7 @@ sa
 sa
 je
 ai
-YA
+cl
 ai
 gN
 cA
@@ -2008,7 +2031,7 @@ sa
 sa
 je
 ai
-bl
+Zq
 ai
 ai
 Bf
@@ -2026,7 +2049,7 @@ Bf
 Bf
 ai
 ai
-bl
+Gw
 ai
 je
 sa

code/__DEFINES/_flags.dm

@@ -132,6 +132,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define QUIET_LOGS (1<<15)
 /// This area does not allow virtual entities to enter.
 #define VIRTUAL_SAFE_AREA (1<<16)
+/// This area does not allow the Binary channel
+#define BINARY_JAMMING (1<<17)
 
 /*
 	These defines are used specifically with the atom/pass_flags bitmask

code/modules/deathmatch/deathmatch_loadouts.dm

@@ -543,3 +543,207 @@
 	granted_spells = list(
 		/datum/action/cooldown/spell/conjure/simian,
 	)
+<<<<<<< HEAD
+=======
+
+/datum/outfit/deathmatch_loadout/head_of_security
+	name = "Deathmatch: Head of Security"
+	display_name = "Head of Security"
+	desc = "Finally, nobody to stop the power from going to your head."
+
+	head = /datum/outfit/job/hos::head
+	ears = 	/datum/outfit/job/hos::ears
+	uniform = /obj/item/clothing/under/rank/security/head_of_security/alt
+	shoes = /datum/outfit/job/hos::shoes
+	neck = /datum/outfit/job/hos::neck
+	glasses = /datum/outfit/job/hos::glasses
+	suit = /obj/item/clothing/suit/armor/hos/hos_formal
+	suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/compact
+	gloves = /obj/item/clothing/gloves/tackler/combat
+	belt = /obj/item/gun/energy/e_gun/hos
+	r_hand = /obj/item/melee/baton/security/loaded
+	l_hand = /obj/item/shield/riot/tele
+	l_pocket = /obj/item/grenade/flashbang
+	r_pocket = /obj/item/restraints/legcuffs/bola/energy
+
+/datum/outfit/deathmatch_loadout/captain
+	name = "Deathmatch: Captain"
+	display_name = "Captain"
+	desc = "Draw your sword and show the syndicate scum no quarter."
+
+	head = /obj/item/clothing/head/hats/caphat/parade
+	ears = /obj/item/radio/headset/heads/captain/alt
+	uniform = /obj/item/clothing/under/rank/captain
+	suit = /obj/item/clothing/suit/armor/vest/capcarapace/captains_formal
+	suit_store = /obj/item/gun/energy/e_gun
+	shoes = /obj/item/clothing/shoes/laceup
+	neck = /obj/item/bedsheet/captain
+	glasses = /obj/item/clothing/glasses/sunglasses
+	gloves = /obj/item/clothing/gloves/captain
+	belt = /obj/item/storage/belt/sabre
+	l_hand = /obj/item/gun/energy/laser/captain
+	r_pocket = /obj/item/assembly/flash
+	l_pocket = /obj/item/melee/baton/telescopic
+
+/datum/outfit/deathmatch_loadout/traitor
+	name = "Deathmatch: Traitor"
+	display_name = "Traitor"
+	desc = "The classic; energy sword & energy bow, donning a reflector trenchcoat (stolen)."
+
+	head = /obj/item/clothing/head/chameleon
+	uniform = /obj/item/clothing/under/chameleon
+	mask = /obj/item/clothing/mask/chameleon
+	suit = /obj/item/clothing/suit/hooded/ablative
+	shoes = /obj/item/clothing/shoes/chameleon/noslip
+	glasses = /obj/item/clothing/glasses/thermal/syndi
+	gloves = /obj/item/clothing/gloves/combat
+	suit_store = /obj/item/gun/energy/recharge/ebow
+	l_hand = /obj/item/melee/energy/sword
+	r_pocket = /obj/item/reagent_containers/hypospray/medipen/stimulants
+	l_pocket = /obj/item/soap/syndie
+	belt = /obj/item/gun/ballistic/revolver/syndicate
+
+/datum/outfit/deathmatch_loadout/nukie
+	name = "Deathmatch: Nuclear Operative"
+	display_name = "Nuclear Operative"
+	desc = "Gear afforded to Lone Operatives. Your mission is simple."
+
+	uniform = /obj/item/clothing/under/syndicate/tacticool
+	back = /obj/item/mod/control/pre_equipped/nuclear
+	r_hand = /obj/item/gun/ballistic/shotgun/bulldog/unrestricted
+	belt = /obj/item/gun/ballistic/automatic/pistol/clandestine
+	r_pocket = /obj/item/reagent_containers/hypospray/medipen/stimulants
+	l_pocket = /obj/item/grenade/syndieminibomb
+	implants = list(/obj/item/implant/explosive)
+
+	backpack_contents = list(
+		/obj/item/ammo_box/c10mm,
+		/obj/item/ammo_box/magazine/m12g = 2,
+		/obj/item/pen/edagger,
+		/obj/item/reagent_containers/hypospray/medipen/atropine,
+	)
+
+/datum/outfit/deathmatch_loadout/pete
+	name = "Deathmatch: Cuban Pete"
+	display_name = "Disciple of Pete"
+	desc = "You took a lesson from Cuban Pete."
+
+	back = /obj/item/storage/backpack/santabag
+	head = /obj/item/clothing/head/collectable/petehat
+	uniform = /obj/item/clothing/under/pants/camo
+	suit = /obj/item/clothing/suit/costume/poncho
+	belt = /obj/item/storage/belt/grenade/full
+	shoes = /obj/item/clothing/shoes/workboots
+	l_hand = /obj/item/reagent_containers/cup/glass/bottle/rum
+	r_hand = /obj/item/sbeacondrop/bomb
+	l_pocket = /obj/item/grenade/syndieminibomb
+	r_pocket = /obj/item/grenade/syndieminibomb
+	implants = list(/obj/item/implanter/explosive_macro)
+	backpack_contents = list(
+		/obj/item/assembly/signaler = 10,
+	)
+
+/datum/outfit/deathmatch_loadout/tider
+	name = "Deathmatch: Tider"
+	display_name = "Tider"
+	desc = "A very high power level Assistant."
+
+	back = /obj/item/melee/baton/security/cattleprod
+	r_hand = /obj/item/fireaxe
+	uniform = /obj/item/clothing/under/color/grey/ancient
+	mask = /obj/item/clothing/mask/gas
+	shoes = /obj/item/clothing/shoes/sneakers/black
+	gloves = /obj/item/clothing/gloves/cut
+	l_pocket = /obj/item/reagent_containers/hypospray/medipen/methamphetamine
+	r_pocket = /obj/item/stock_parts/power_store/cell/high
+	belt = /obj/item/storage/belt/utility/full
+
+/datum/outfit/deathmatch_loadout/abductor
+	name = "Deathmatch: Abductor"
+	display_name = "Abductor"
+	desc = "We come in peace."
+
+	species_override = /datum/species/abductor
+	uniform = /obj/item/clothing/under/abductor
+	head = /obj/item/clothing/head/helmet/abductor
+	suit = /obj/item/clothing/suit/armor/abductor/vest
+	l_pocket = /obj/item/reagent_containers/hypospray/medipen/atropine
+	r_pocket = /obj/item/grenade/gluon
+	l_hand = /obj/item/gun/energy/alien
+	r_hand = /obj/item/gun/energy/alien
+	belt = /obj/item/gun/energy/shrink_ray
+
+/datum/outfit/deathmatch_loadout/battler/clown/upgraded
+	name = "Deathmatch: Clown (Syndicate Gear)"
+	display_name = "Clown Commando"
+	desc = "They were bound to show up sooner or later."
+
+	shoes = /obj/item/clothing/shoes/clown_shoes/combat
+	r_hand = /obj/item/pneumatic_cannon/pie/selfcharge
+	l_hand = /obj/item/bikehorn/golden
+	box = /obj/item/storage/box/hug/reverse_revolver
+
+	backpack_contents = list(
+		/obj/item/paperplane/syndicate = 1,
+		/obj/item/restraints/legcuffs/bola/tactical = 1,
+		/obj/item/restraints/legcuffs/beartrap = 1,
+		/obj/item/food/grown/banana = 1,
+		/obj/item/food/pie/cream = 1,
+		/obj/item/dnainjector/clumsymut,
+		/obj/item/sbeacondrop/clownbomb,
+		)
+
+/datum/outfit/deathmatch_loadout/mime
+	name = "Deathmatch: Mime"
+	display_name = "Mime"
+	desc = "..."
+
+	uniform = /datum/outfit/job/mime::uniform
+	belt = /obj/item/food/baguette/combat
+	head = /datum/outfit/job/mime::head
+	shoes = /datum/outfit/job/mime::shoes
+	mask = /datum/outfit/job/mime::mask
+	back = /datum/outfit/job/mime::backpack
+	box = /datum/outfit/job/mime::box
+	l_pocket = /obj/item/toy/crayon/spraycan/mimecan
+	r_pocket = /obj/item/food/grown/banana/mime
+	neck = /datum/outfit/job/mime::neck
+	gloves = /datum/outfit/job/mime::gloves
+
+	backpack_contents = list(
+		/obj/item/reagent_containers/cup/glass/bottle/bottleofnothing,
+		/obj/item/gun/ballistic/automatic/pistol,
+		/obj/item/suppressor,
+		/obj/item/ammo_box/c9mm,
+		/obj/item/food/croissant/throwing = 2,
+		)
+
+	granted_spells = list(
+		/datum/action/cooldown/spell/vow_of_silence,
+		/datum/action/cooldown/spell/conjure_item/invisible_box,
+		/datum/action/cooldown/spell/conjure/invisible_chair,
+		/datum/action/cooldown/spell/conjure/invisible_wall,
+		/datum/action/cooldown/spell/forcewall/mime,
+		/datum/action/cooldown/spell/pointed/projectile/finger_guns,
+		)
+
+/datum/outfit/deathmatch_loadout/chef/upgraded
+	name = "Deathmatch: Master Chef"
+	display_name = "Master Chef"
+	desc = "Let him cook."
+
+	belt = /obj/item/gun/magic/hook
+	uniform = /obj/item/clothing/under/costume/buttondown/slacks/service
+	suit = /obj/item/clothing/suit/toggle/chef
+	suit_store = /obj/item/knife/kitchen
+	head = /obj/item/clothing/head/utility/chefhat
+	mask = /obj/item/clothing/mask/fakemoustache/italian
+	gloves = /obj/item/clothing/gloves/the_sleeping_carp
+	back = /obj/item/storage/backpack
+
+	backpack_contents = list(
+		/obj/item/pizzabox/bomb/armed = 3,
+		/obj/item/knife/butcher,
+		/obj/item/sharpener,
+	)
+>>>>>>> 952f9c8c6cd... [MIRROR] some deathmatch fixes [MDB IGNORE] (#3501)