Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Conflicts:
	maps/cyberiad.dmm

code/datums/supplypacks.dm

@@ -751,6 +751,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	name = "Ballistic gear crate"
 	contains = list(/obj/item/clothing/suit/armor/bulletproof,
 					/obj/item/clothing/suit/armor/bulletproof,
+					/obj/item/weapon/storage/belt/bandolier,
+					/obj/item/weapon/storage/belt/bandolier,
 					/obj/item/weapon/gun/projectile/shotgun/combat,
 					/obj/item/weapon/gun/projectile/shotgun/combat)
 	cost = 50

code/game/jobs/job/support.dm

@@ -22,20 +22,13 @@
 		H.equip_or_collect(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit)
 		H.equip_or_collect(new /obj/item/clothing/under/rank/bartender(H), slot_w_uniform)
 		H.equip_or_collect(new /obj/item/device/pda/bar(H), slot_wear_pda)
+		H.equip_or_collect(new /obj/item/weapon/storage/belt/bandolier/full(H), slot_belt)
 
 		if(H.backbag == 1)
 			var/obj/item/weapon/storage/box/survival/Barpack = new /obj/item/weapon/storage/box/survival(H)
 			H.equip_or_collect(Barpack, slot_r_hand)
-			new /obj/item/ammo_casing/shotgun/beanbag(Barpack)
-			new /obj/item/ammo_casing/shotgun/beanbag(Barpack)
-			new /obj/item/ammo_casing/shotgun/beanbag(Barpack)
-			new /obj/item/ammo_casing/shotgun/beanbag(Barpack)
 		else
 			H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H), slot_in_backpack)
-			H.equip_or_collect(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack)
-			H.equip_or_collect(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack)
-			H.equip_or_collect(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack)
-			H.equip_or_collect(new /obj/item/ammo_casing/shotgun/beanbag(H), slot_in_backpack)
 
 		H.dna.SetSEState(SOBERBLOCK,1)
 		H.mutations += M_SOBER

code/game/objects/items/devices/paicard.dm

@@ -225,9 +225,17 @@
 
 /obj/item/device/paicard/Topic(href, href_list)
 
+	var/mob/U = usr
+
 	if(!usr || usr.stat)
 		return
 
+	if(pai)
+		if(!in_range(src, U) || pai.canmove || pai.resting)
+			U << browse(null, "window=paicard")
+			usr.unset_machine()
+			return
+
 	if(href_list["setdna"])
 		if(pai.master_dna)
 			return
@@ -250,6 +258,10 @@
 				M << "<font color = #ff4d4d><h3>Byte by byte you lose your sense of self.</h3></font>"
 				M << "<font color = #ff8787><h4>Your mental faculties leave you.</h4></font>"
 				M << "<font color = #ffc4c4><h5>oblivion... </h5></font>"
+				var/mob/living/silicon/pai/P = M
+				if(istype(P))
+					if(P.resting || P.canmove)
+						P.close_up()
 				M.death(0)
 			removePersonality()
 	if(href_list["wires"])
@@ -302,3 +314,8 @@
 		M.emp_act(severity)
 	..()
 
+/obj/item/device/paicard/ex_act(severity)
+	if(pai)
+		pai.ex_act(severity)
+	else
+		del(src)

code/game/objects/items/weapons/storage/belt.dm

@@ -177,4 +177,23 @@
 		"/obj/item/weapon/reagent_containers/spray",
 		"/obj/item/weapon/soap",
 		"/obj/item/weapon/holosign_creator"
-		)
+		)
+
+/obj/item/weapon/storage/belt/bandolier
+	name = "bandolier"
+	desc = "A bandolier for holding shotgun ammunition."
+	icon_state = "bandolier"
+	item_state = "bandolier"
+	storage_slots = 6
+	can_hold = list(
+		"/obj/item/ammo_casing/shotgun"
+		)
+
+/obj/item/weapon/storage/belt/bandolier/full/New()
+	..()
+	new /obj/item/ammo_casing/shotgun/beanbag(src)
+	new /obj/item/ammo_casing/shotgun/beanbag(src)
+	new /obj/item/ammo_casing/shotgun/beanbag(src)
+	new /obj/item/ammo_casing/shotgun/beanbag(src)
+	new /obj/item/ammo_casing/shotgun/beanbag(src)
+	new /obj/item/ammo_casing/shotgun/beanbag(src)

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

@@ -102,10 +102,11 @@
 			new /obj/item/weapon/storage/backpack/satchel_sec(src)
 		new /obj/item/weapon/cartridge/hos(src)
 		new /obj/item/device/radio/headset/heads/hos(src)
-		new /obj/item/clothing/under/rank/head_of_security/jensen(src)
-		new /obj/item/clothing/under/rank/head_of_security/corp(src)
+		new /obj/item/clothing/under/rank/head_of_security(src)
+		new /obj/item/clothing/under/rank/head_of_security/formal(src)
 		new /obj/item/clothing/suit/armor/hos(src)
 		new /obj/item/clothing/head/HoS(src)
+		new /obj/item/clothing/head/HoS/beret(src)
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)
 		new /obj/item/weapon/storage/lockbox/loyalty(src)
 		new /obj/item/weapon/storage/box/flashbangs(src)
@@ -141,8 +142,10 @@
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/clothing/suit/armor/vest/warden(src)
 		new /obj/item/clothing/head/warden(src)
+		new /obj/item/clothing/suit/armor/vest/warden/alt(src)
+		new /obj/item/clothing/head/beret/sec/warden(src)
 		new /obj/item/clothing/under/rank/warden(src)
-		new /obj/item/clothing/under/rank/warden/corp(src)
+		new /obj/item/clothing/under/rank/warden/formal(src)
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)
 		new /obj/item/clothing/mask/gas/sechailer/warden(src)
 		new /obj/item/taperoll/police(src)

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

@@ -23,21 +23,18 @@
 	new /obj/item/clothing/under/rank/security(src)
 	new /obj/item/clothing/under/rank/security(src)
 	new /obj/item/clothing/under/rank/security(src)
-	new /obj/item/clothing/under/rank/security2(src)
-	new /obj/item/clothing/under/rank/security2(src)
-	new /obj/item/clothing/under/rank/security2(src)
-	new /obj/item/clothing/under/rank/security/corp(src)
-	new /obj/item/clothing/under/rank/security/corp(src)
-	new /obj/item/clothing/under/rank/security/corp(src)
+	new /obj/item/clothing/under/rank/security/formal(src)
+	new /obj/item/clothing/under/rank/security/formal(src)
+	new /obj/item/clothing/under/rank/security/formal(src)
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/clothing/shoes/jackboots/jacksandals(src)
+	new /obj/item/clothing/shoes/jackboots/jacksandals(src)
+	new /obj/item/clothing/shoes/jackboots/jacksandals(src)
 	new /obj/item/clothing/head/soft/sec(src)
 	new /obj/item/clothing/head/soft/sec(src)
 	new /obj/item/clothing/head/soft/sec(src)
-	new /obj/item/clothing/head/soft/sec/corp(src)
-	new /obj/item/clothing/head/soft/sec/corp(src)
-	new /obj/item/clothing/head/soft/sec/corp(src)
 	new /obj/item/clothing/head/beret/sec(src)
 	new /obj/item/clothing/head/beret/sec(src)
 	new /obj/item/clothing/head/beret/sec(src)

code/game/vehicles/spacepods/equipment.dm

@@ -77,7 +77,7 @@
 	name = "\improper taser system"
 	desc = "A weak taser system for space pods, fires electrodes that shock upon impact."
 	icon_state = "pod_taser"
-	projectile_type = "/obj/item/projectile/energy/electrode"
+	projectile_type = "/obj/item/projectile/beam/disabler"
 	shot_cost = 250
 	fire_sound = "sound/weapons/Taser.ogg"
 
@@ -85,7 +85,7 @@
 	name = "\improper burst taser system"
 	desc = "A weak taser system for space pods, this one fires 3 at a time."
 	icon_state = "pod_b_taser"
-	projectile_type = "/obj/item/projectile/energy/electrode"
+	projectile_type = "/obj/item/projectile/beam/disabler"
 	shot_cost = 350
 	shots_per = 3
 	fire_sound = "sound/weapons/Taser.ogg"

code/game/verbs/suicide.dm

@@ -177,7 +177,7 @@
 	set name = "pAI Suicide"
 	var/answer = input("REALLY kill yourself? This action can't be undone.", "Suicide", "No") in list ("Yes", "No")
 	if(answer == "Yes")
-		if(canmove && !resting)
+		if(canmove || resting)
 			close_up()
 		var/obj/item/device/paicard/card = loc
 		card.removePersonality()

code/modules/clothing/head/jobs.dm

@@ -80,6 +80,11 @@
 	flags = FPRINT | TABLEPASS
 	armor = list(melee = 80, bullet = 60, laser = 50, energy = 10, bomb = 25, bio = 10, rad = 0)
 
+/obj/item/clothing/head/HoS/beret
+	name = "head of security beret"
+	desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection."
+	icon_state = "hosberetblack"
+
 /obj/item/clothing/head/warden
 	name = "warden's police hat"
 	desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts."
@@ -102,6 +107,12 @@
 	armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
 	flags = FPRINT | TABLEPASS
 
+/obj/item/clothing/head/beret/sec/warden
+	name = "warden's beret"
+	desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
+	icon_state = "wardenberet"
+	armor = list(melee = 60, bullet = 5, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
+
 /obj/item/clothing/head/beret/eng
 	name = "engineering beret"
 	desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety."

code/modules/clothing/head/misc.dm

@@ -219,7 +219,7 @@
 	set category = "Object"
 	set desc = "Show that CIS SCUM who's boss."
 
-	usr << "You tip your fedora"
+	usr.visible_message("[usr] tips their fedora.","You tip your fedora")
 
 /obj/item/clothing/head/fez
 	name = "\improper fez"

code/modules/clothing/shoes/miscellaneous.dm

@@ -94,6 +94,12 @@
 	siemens_coefficient = 0.7
 	var/footstep=1
 
+/obj/item/clothing/shoes/jackboots/jacksandals
+	name = "jacksandals"
+	desc = "Nanotrasen-issue Security combat sandals for combat scenarios. They're jacksandals, however that works."
+	icon_state = "jacksandal"
+	species_restricted = null
+
 /obj/item/clothing/shoes/cult
 	name = "boots"
 	desc = "A pair of boots worn by the followers of Nar-Sie."

code/modules/clothing/suits/armor.dm

@@ -53,8 +53,8 @@
 		if(!usr.canmove || usr.stat || usr.restrained())
 			return 0
 		if(icon_state == "hos")
-			icon_state = "jensencoat"
-			item_state = "jensencoat"
+			icon_state = "hostrench"
+			item_state = "hostrench"
 			usr<< "You unbutton the [src]."
 		else
 			icon_state = "hos"
@@ -72,7 +72,7 @@
 	siemens_coefficient = 0.6
 
 /obj/item/clothing/suit/armor/vest/warden
-	name = "Warden's jacket"
+	name = "Warden's armored jacket"
 	desc = "An armoured jacket with silver rank pips and livery."
 	icon_state = "warden_jacket"
 	item_state = "armor"
@@ -80,6 +80,11 @@
 	cold_protection = UPPER_TORSO|LOWER_TORSO|HANDS
 	heat_protection = UPPER_TORSO|LOWER_TORSO|HANDS
 
+/obj/item/clothing/suit/armor/vest/warden/alt
+	name = "warden's jacket"
+	desc = "A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets."
+	icon_state = "warden_jacket_alt"
+
 /obj/item/clothing/suit/armor/vest/capcarapace
 	name = "captain's carapace"
 	desc = "An armored vest reinforced with ceramic plates and pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest, although it does chafe your nipples."

code/modules/clothing/under/jobs/security.dm

@@ -119,4 +119,27 @@
 /obj/item/clothing/suit/armor/hos/officerbluejacket
 	name = "officer's blue jacket"
 	icon_state = "officerbluejacket"
-	item_state = "officerbluejacket"
+	item_state = "officerbluejacket"
+
+//TG Station
+
+/obj/item/clothing/under/rank/security/formal
+	name = "security suit"
+	desc = "A formal security suit for officers complete with nanotrasen belt buckle."
+	icon_state = "security_formal"
+	item_state = "gy_suit"
+	_color = "security_formal"
+
+/obj/item/clothing/under/rank/warden/formal
+	name = "warden's suit"
+	desc = "A formal security suit for the warden with blue desginations and '/Warden/' stiched into the shoulders."
+	icon_state = "warden_formal"
+	item_state = "gy_suit"
+	_color = "warden_formal"
+
+/obj/item/clothing/under/rank/head_of_security/formal
+	name = "head of security's suit"
+	desc = "A security suit decorated for those few with the dedication to achieve the position of Head of Security."
+	icon_state = "hos_formal"
+	item_state = "gy_suit"
+	_color = "hos_formal"

code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

@@ -53,13 +53,13 @@
 /mob/living/carbon/alien/humanoid/movement_delay()
 	var/tally = 0
 	if (istype(src, /mob/living/carbon/alien/humanoid/queen))
-		tally += 4
+		tally += 5
 	if (istype(src, /mob/living/carbon/alien/humanoid/drone))
-		tally += 0
+		tally += 1
 	if (istype(src, /mob/living/carbon/alien/humanoid/sentinel))
-		tally += 0
+		tally += 1
 	if (istype(src, /mob/living/carbon/alien/humanoid/hunter))
-		tally = -2 // hunters go supersuperfast
+		tally = -1 // hunters go supersuperfast
 	return (tally + move_delay_add + config.alien_delay)
 
 /mob/living/carbon/alien/humanoid/Process_Spacemove(var/check_drift = 0)

code/modules/mob/living/carbon/human/human_movement.dm

@@ -14,13 +14,14 @@
 	if((M_RUN in mutations)) return -1
 
 	var/health_deficiency = (100 - health + staminaloss)
-
-	if(health_deficiency >= 40) tally += (health_deficiency / 25)
+	if(health_deficiency >= 40)
+		tally += (health_deficiency / 25)
 
 	if(halloss >= 10) tally += (halloss / 10)
 
 	var/hungry = (500 - nutrition)/5 // So overeat would be 100 and default level would be 80
-	if (hungry >= 70) tally += hungry/50
+	if (hungry >= 70)
+		tally += hungry/50
 
 	if(wear_suit)
 		tally += wear_suit.slowdown

code/modules/mob/living/silicon/pai/death.dm

@@ -1,13 +1,15 @@
 /mob/living/silicon/pai/death(gibbed)
 	if(stat == DEAD)	return
-	var/turf/T = get_turf_or_move(loc)
-	for (var/mob/M in viewers(T))
-		M.show_message("\red A shower of sparks spray from [src]'s inner workings.", 3, "\red You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2)
-	var/obj/effect/decal/cleanable/deadpai = new /obj/effect/decal/cleanable/robot_debris(loc)
 	if(canmove || resting)
-		deadpai.icon = 'icons/mob/pai.dmi'
-		deadpai.icon_state = "[chassis]_dead"
-	del(src)
+		var/turf/T = get_turf_or_move(loc)
+		for (var/mob/M in viewers(T))
+			M.show_message("\red [src] emits a dull beep before it loses power and collapses.", 3, "\red You hear a dull beep followed by the sound of glass crunching.", 2)
+		name = "pAI debris"
+		desc = "The unfortunate remains of some poor personal AI device."
+		icon_state = "[chassis]_dead"
+	else
+		card.overlays.Cut()
+		card.overlays += "pai-off"
 	stat = DEAD
 	canmove = 0
 	if(blind)	blind.layer = 0
@@ -23,3 +25,5 @@
 	if(mind)	del(mind)
 	living_mob_list -= src
 	ghostize()
+	if(icon_state != "[chassis]_dead")
+		del(src)

code/modules/mob/living/silicon/pai/pai.dm

@@ -24,6 +24,7 @@
 		"Cat" = "cat",
 		"Mouse" = "mouse",
 		"Monkey" = "monkey",
+		"Corgi" = "corgi",
 		"Fox" = "fox"
 		)
 
@@ -80,7 +81,6 @@
 		if(!card.radio)
 			card.radio = new /obj/item/device/radio(src.card)
 		radio = card.radio
-
 	//Verbs for pAI mobile form, chassis and Say flavor text
 	verbs += /mob/living/silicon/pai/proc/choose_chassis
 	verbs += /mob/living/silicon/pai/proc/choose_verbs
@@ -174,16 +174,16 @@
 
 	switch(severity)
 		if(1.0)
-			if (src.stat != 2)
-				adjustBruteLoss(100)
-				adjustFireLoss(100)
+			if (src.stat != 2) //Let's not have two of these instantly kill you.
+				adjustBruteLoss(45)
+				adjustFireLoss(45)
 		if(2.0)
 			if (src.stat != 2)
-				adjustBruteLoss(60)
-				adjustFireLoss(60)
+				adjustBruteLoss(30)
+				adjustFireLoss(30)
 		if(3.0)
 			if (src.stat != 2)
-				adjustBruteLoss(30)
+				adjustBruteLoss(20)
 
 	src.updatehealth()
 
@@ -200,8 +200,6 @@
 		src.updatehealth()
 	return
 
-//mob/living/silicon/pai/bullet_act(var/obj/item/projectile/Proj)
-
 /mob/living/silicon/pai/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
 	if (!ticker)
 		M << "You cannot attack people before the game has started."
@@ -236,8 +234,6 @@
 						O.show_message(text("\red <B>[] took a swipe at []!</B>", M, src), 1)
 	return
 
-///mob/living/silicon/pai/attack_hand(mob/living/carbon/M as mob)
-
 /mob/living/silicon/pai/proc/switchCamera(var/obj/machinery/camera/C)
 	usr:cameraFollow = null
 	if (!C)
@@ -412,19 +408,22 @@
 		src.updatehealth()
 	else
 		visible_message("<span class='warning'>[user.name] bonks [src] harmlessly with [W].</span>")
-	if(stat != 2) close_up()
+	spawn(1)
+		if(stat != 2)
+			close_up()
 	return
 
 /mob/living/silicon/pai/attack_hand(mob/user as mob)
 	if(stat == 2) return
 	visible_message("<span class='danger'>[user.name] boops [src] on the head.</span>")
-	close_up()
+	spawn(1)
+		close_up()
 
 //I'm not sure how much of this is necessary, but I would rather avoid issues.
 /mob/living/silicon/pai/proc/close_up()
 
 	last_special = world.time + 200
-
+	resting = 0
 	if(src.loc == card)
 		return
 
@@ -443,10 +442,18 @@
 	canmove = 0
 	icon_state = "[chassis]"
 
-/mob/living/silicon/pai/start_pulling(var/atom/movable/AM)
+/mob/living/silicon/pai/Bump(atom/movable/AM as mob|obj, yes)
+	return
 
+/mob/living/silicon/pai/Bumped(AM as mob|obj)
+	return
+
+/mob/living/silicon/pai/start_pulling(var/atom/movable/AM)
+	if(stat || sleeping || paralysis || weakened)
+		return
 	if(istype(AM,/obj/item))
 		src << "<span class='warning'>You are far too small to pull anything!</span>"
+	return
 
 /mob/living/silicon/pai/examine()
 
@@ -479,6 +486,7 @@
 	..(Proj)
 	updatehealth()
 	if (stat != 2)
-		close_up()
+		spawn(1)
+			close_up()
 	return 2
 

code/modules/mob/mob_movement.dm

@@ -245,14 +245,14 @@
 			if("run")
 				if(mob.drowsyness > 0)
 					move_delay += 6
-				move_delay += 1+config.run_speed
+				move_delay += config.run_speed
 			if("walk")
-				move_delay += 7+config.walk_speed
+				move_delay += config.walk_speed
 		move_delay += mob.movement_delay()
 
 		if(config.Tickcomp)
 			move_delay -= 1.3
-			var/tickcomp = ((1/(world.tick_lag))*1.3)
+			var/tickcomp = (1 / (world.tick_lag)) * 1.3
 			move_delay = move_delay + tickcomp
 
 		if(istype(mob.buckled, /obj/vehicle) || istype(mob.buckled, /obj/structure/stool/bed/chair/cart))

code/setup.dm

@@ -167,7 +167,7 @@ var/MAX_EXPLOSION_RANGE = 14
 
 #define FLOWFRAC 0.99				// fraction of gas transfered per process
 
-#define SHOES_SLOWDOWN -1.0			// How much shoes slow you down by default. Negative values speed you up
+#define SHOES_SLOWDOWN 0			// How much shoes slow you down by default. Negative values speed you up
 
 
 //ITEM INVENTORY SLOT BITMASKS

config/example/config.txt

@@ -185,10 +185,10 @@ LOAD_JOBS_FROM_TXT
 ## Remove the # to allow special 'Easter-egg' events on special holidays such as seasonal holidays and stuff like 'Talk Like a Pirate Day' :3 YAARRR
 ALLOW_HOLIDAYS
 ##Defines the ticklag for the world.  0.9 is the normal one, 0.5 is smoother.
-TICKLAG 0.5
+TICKLAG 0.9
 
 ## Defines if Tick Compensation is used.  It results in a minor slowdown of movement of all mobs, but attempts to result in a level movement speed across all ticks.  Recommended if tickrate is lowered.
-TICKCOMP 1
+TICKCOMP 0
 
 ## Whether the server will talk to other processes through socket_talk
 SOCKET_TALK 0

config/example/game_options.txt

@@ -1,7 +1,7 @@
 ### HEALTH ###
 
 ## level of health at which a mob becomes unconscious (crit)
-HEALTH_THRESHOLD_CRIT -0
+HEALTH_THRESHOLD_CRIT -50
 
 ## level of health at which a mob becomes dead
 HEALTH_THRESHOLD_DEAD -100
@@ -19,7 +19,7 @@ ORGAN_HEALTH_MULTIPLIER 100
 
 ## multiplier which influences how fast organs regenerate naturally
 ## 100 means normal, 50 means half
-ORGAN_REGENERATION_MULTIPLIER 100
+ORGAN_REGENERATION_MULTIPLIER 0
 
 ### REVIVAL ###
 
@@ -43,7 +43,7 @@ REVIVAL_BRAIN_LIFE -1
 
 ## These modify the run/walk speed of all mobs before the mob-specific modifiers are applied. 
 RUN_SPEED 1
-WALK_SPEED 3
+WALK_SPEED 4
 
 
 ## The variables below affect the movement of specific mob types.

interface/interface.dm

@@ -136,7 +136,7 @@ Admin:
 
 	if(hotkeyon)//using an if statement because I don't want to clutter winset() with ? operators
 		winset(usr, "mainwindow.hotkey_toggle", "is-checked=true")//checks the button
-		winset(usr, "mainwindow.mapwindow", "focus=true")//sets mapwindow focus
+		winset(usr, "mapwindow.map", "focus=true")//sets mapwindow focus
 	else
 		winset(usr, "mainwindow.hotkey_toggle", "is-checked=false")//unchecks the button
 		winset(usr, "mainwindow.input", "focus=true")//sets focus

maps/cyberiad.dmm

@@ -400,7 +400,6 @@
 "ahJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/security/armoury)
 "ahK" = (/turf/simulated/floor,/area/security/armoury)
 "ahL" = (/obj/machinery/light{dir = 4},/obj/structure/rack,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/item/weapon/storage/box/teargas,/obj/effect/decal/warning_stripes/red/hollow,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/armoury)
-"ahM" = (/obj/effect/landmark/start{name = "Head of Security"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "ahN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor,/area/security/securehallway)
 "ahO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/security/securehallway)
 "ahP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/security/securehallway)
@@ -12697,7 +12696,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaaaaaaaaaaafyaabaixaixaixaixaixaabajDaabaixaixaixaixaixaabafyaaaafzamlanRanRanRamlaaiaaiaaianSanTanUanVanWamWamWamWanXanYanZaoaaobaocaodaoeaofaogaohaofaoiaojaocaokaocaolaocaocaolaomaocaolaocaocaonaooaoeaomaopaoqaoraosaotaouaovaaqanLaowamNamNaoxaaaaoyaozaoyaaaaaaaaaahVahVahVaaaaaaaaaaaaaaaaaaaaaafzaabaoAaoAaoAaoAaoAaabaoBaabaoAaoAaoAaoAaoAaabafzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkamkaaaamkamkamkamkamkamkamkamkamkaaaamkamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaaaaafyaabaiYaiZaiZaiZaiZajaajbajcajdajdajdajdajeaaaafyaaaafzamlanRanRanRamlaaaaaaaaiaaqaoCaoDaaKaaKamWamWaaqaaqaaqaaqaoEaoFaaqaaqaaqaoGaoHaoIaoGaaqaaqaaqaoJaoKaaqaoLaoMaaqaoNaoKaaqaaqaaqaoOaoPaaqaaKaoQaoRaoSaoTaaqamHaovaoUaaiaaiaaiaoVaoWaoXaaiaoYaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafzaabaoZapaapaapaapaapbapcapdapeapeapeapeapfaabafzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkamkaaaamkamkamkamkamkamkamkamkamkaaaamkamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaafyaabajCajCajCajCajCaabapgaabajCajCajCajCajCaabafyaaaaghaphapianRanRamlaaaaaaaaiapjapkaplapmapnamWapoaaqappapqaprapsaptapuapvapwapxapyapzapAapBapCapuapDapEapFapGapHapIapJapEaaqapKapLapMapNaaqapOapPapQapRapSapTamHaovapUapVapWapXapYapYapZaaiaqaaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafzaabaqbaqbaqbaqbaqbaabaqcaabaqbaqbaqbaqbaqbaabafzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkamkaaaamkamkamkamkamkamkamkamkamkaaaamkamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaafyaaaaabaabaabaabaabaaaaqdaqeaqeaqeaqeaqeaqfaabafyaaaafzamlaqgaqhaqiaqjaaaaaaaaiaqkaqlaqmaqnaaKaqoamWaaqaqpaqqaqraqsaqtaquaqvaqwaqxaqyaqzaqAaqwaqBaqCaqDaqEaqFaqGaqHaqIaqJaqKaqLaqMaqNaqOaqPaaqaqQaqRaqRaqSaqRaqTamHaovanLanLahManLaqUanLaqVaqWaqXaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaaaaaaaaafyaaaaaaaaaaabaaaaaaaabaqcaaaaaaaaaaabaaaaaaaaaafyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaafyaaaaabaabaabaabaabaaaaqdaqeaqeaqeaqeaqeaqfaabafyaaaafzamlaqgaqhaqiaqjaaaaaaaaiaqkaqlaqmaqnaaKaqoamWaaqaqpaqqaqraqsaqtaquaqvaqwaqxaqyaqzaqAaqwaqBaqCaqDaqEaqFaqGaqHaqIaqJaqKaqLaqMaqNaqOaqPaaqaqQaqRaqRaqSaqRaqTamHaovanLanLanLanLaqUanLaqVaqWaqXaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaaaaaaaaafyaaaaaaaaaaabaaaaaaaabaqcaaaaaaaaaaabaaaaaaaaaafyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaafyafyafyafyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqYaaaafyaaaafzaqZaraarbarbamlaaaaaaaaiaqkarcardareaaKarfargaaqarhariarjarkarlarmarnaroarparqarrarsartaruarmarvaqKarwarxaryarwaqJaqKaaqarzarAarBarCaaqarDarEaqRaqSaqRarFamHarGarHarIarJarIarHarKacgarLaaqaaiarMarNarOarParQarRarSarRarRaaiaaaaaaaaaafzaabaoAaoAaoAaoAaoAaabaqcaabaoAaoAaoAaoAaoAaabafzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqYaaaaaaaaaafzamlarbarbarbamlaaaaaaaaiaaiabnaaiaaiaftaaiarTaaiaaqaaqaaqarUarVaaqaaqaaqaaqarWarXaaqaaqaaqaaiarYarZasaasbascasdaqJaseaaqasfasgashasiabJasjaskaslasmaqRasnamHasoaspasqasrassastanLaaiasuasvaaiaswasxasyaszaszaszaszaszasAaaiaaaaaaaaaafzaabaoZapaapaapaapaapbapcapdapeapeapeapeapfaabafzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaiaaiaaiaaiaaiaaiaaaaaaaaaaaaaaaaqYaaaaaaaaaafyamlarbarbarbamlaaiaaiaaiasBasCasDasEasFasGasHaaiasIapqaprapsaptapuasJapwasKasLasMasNasOasPapuasQasRasSasTasUasUasVasWaaqasXasYasZataaaqatbatcatdaqSaqRateamHasoaqUaspaspaspatfatgathatiatjaaiatkatlatmatnatoatpatqatqatraaiaaaaaaaaaafzaabaqbaqbaqbaqbaqbaabaqcaabaqbaqbaqbaqbaqbaabafzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa