Ремап медбея, техов медбея, библиотеки бокса

code/game/area/station_areas.dm

@@ -452,10 +452,21 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "medbay2"
 	sound_environment = SOUND_AREA_STATION_HALLWAY
 
+/area/station/medical/staff_hallway
+	icon_state = "medbay2"
+
 /area/station/medical/reception
 	name = "Medbay Reception"
 	icon_state = "medbay"
 
+/area/station/medical/paramedic
+	name = "Paramedic Reception"
+	icon_state = "medbay"
+
+/area/station/medical/reception_hall
+	name = "Medbay Reception hall"
+	icon_state = "medbay"
+
 /area/station/medical/storage
 	name = "Medbay Storage"
 	icon_state = "medbay3"
@@ -472,6 +483,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Patient's Rooms"
 	icon_state = "patients"
 
+/area/station/medical/hospital
+	name = "Hospital"
+	icon_state = "medbay2"
+
+/area/station/medical/infectious_disease_ward
+	name = "Infectious disease ward"
+	icon_state = "virology"
+
 /area/station/medical/patient_a
 	name = "Patient Room One"
 	icon_state = "patients"
@@ -480,6 +499,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Patient Room Two"
 	icon_state = "patients"
 
+/area/station/medical/patient_c
+	name = "Patient Room Three"
+	icon_state = "patients"
+
+/area/station/medical/patient_d
+	name = "Patient Room Four"
+	icon_state = "patients"
+
 /area/station/medical/cmo
 	name = "Chief Medical Officer's office"
 	icon_state = "CMO"
@@ -516,6 +543,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Cryogenics"
 	icon_state = "cryo"
 
+/area/station/medical/therapist
+	name = "Therapist Cabinet"
+	icon_state = "medbay3"
+
 /area/station/medical/genetics
 	name = "Genetics Lab"
 	icon_state = "genetics"
@@ -593,6 +624,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Security Checkpoint"
 	icon_state = "security"
 
+/area/station/security/medbay_checkpoint
+	name = "Medbay Security Checkpoint"
+	icon_state = "security"
+
 /area/station/security/vacantoffice
 	name = "Coworking"
 	icon_state = "security"

code/game/objects/effects/decals/contraband.dm

@@ -596,4 +596,9 @@
 	desc = "This informational poster teaches the viewer what carbon dioxide is."
 	icon_state = "poster35_legit"
 
+/obj/structure/sign/poster/official/sivtsev
+	name = "Sivtsev's chart"
+	desc = "This is an eye chart that can be used to measure visual acuity.."
+	icon_state = "Sivtsev's chart"
+
 #undef PLACE_SPEED

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

@@ -13,17 +13,18 @@
 
 	integrity_failure = 0.5
 
-	var/obj/item/weapon/fireaxe/fireaxe
+	var/obj/item/weapon/axe
+	var/axe_type = /obj/item/weapon/fireaxe
 	var/localopened = FALSE // Setting this to keep it from behaviouring like a normal closet and obstructing movement in the map. -Agouri
 	var/hitstaken = 0
 	var/smashed = FALSE
 
 /obj/structure/closet/fireaxecabinet/Destroy()
-	QDEL_NULL(fireaxe)
+	QDEL_NULL(axe)
 	return ..()
 
 /obj/structure/closet/fireaxecabinet/PopulateContents()
-	fireaxe = new /obj/item/weapon/fireaxe(src)
+	axe = new axe_type(src)
 
 /obj/structure/closet/fireaxecabinet/attackby(obj/item/O, mob/living/user)  //Marker -Agouri
 	//..() //That's very useful, Erro
@@ -44,15 +45,15 @@
 			if(smashed || localopened)
 				if(localopened)
 					localopened = FALSE
-					icon_state = text("fireaxe[][][][]closing", !!fireaxe, localopened, hitstaken, smashed)
+					icon_state = text("fireaxe[][][][]closing", !!axe, localopened, hitstaken, smashed)
 					addtimer(CALLBACK(src, /atom.proc/update_icon), 10)
 				return
 			..()
 
-	else if (istype(O, /obj/item/weapon/fireaxe) && localopened)
-		if(!fireaxe)
+	else if (istype(O, axe_type) && localopened)
+		if(!axe)
 			user.drop_from_inventory(O, src)
-			fireaxe = O
+			axe = O
 			to_chat(user, "<span class='notice'>You place the fire axe back in the [src.name].</span>")
 			update_icon()
 		else
@@ -61,18 +62,18 @@
 			else
 				localopened = !localopened
 				if(localopened)
-					icon_state = text("fireaxe[][][][]opening", !!fireaxe, localopened, hitstaken, smashed)
+					icon_state = text("fireaxe[][][][]opening", !!axe, localopened, hitstaken, smashed)
 					addtimer(CALLBACK(src, /atom.proc/update_icon), 10)
 				else
-					icon_state = text("fireaxe[][][][]closing", !!fireaxe, localopened, hitstaken, smashed)
+					icon_state = text("fireaxe[][][][]closing", !!axe, localopened, hitstaken, smashed)
 					addtimer(CALLBACK(src, /atom.proc/update_icon), 10)
 	else
 		if(smashed)
 			return
 		if(ismultitool(O))
 			if(localopened)
 				localopened = FALSE
-				icon_state = text("fireaxe[][][][]closing", !!fireaxe, localopened, hitstaken, smashed)
+				icon_state = text("fireaxe[][][][]closing", !!axe, localopened, hitstaken, smashed)
 				addtimer(CALLBACK(src, /atom.proc/update_icon), 10)
 			else
 				to_chat(user, "<span class='warning'>Resetting circuitry...</span>")
@@ -83,10 +84,10 @@
 		else
 			localopened = !localopened
 			if(localopened)
-				icon_state = text("fireaxe[][][][]opening", !!fireaxe, localopened, hitstaken, smashed)
+				icon_state = text("fireaxe[][][][]opening", !!axe, localopened, hitstaken, smashed)
 				addtimer(CALLBACK(src, /atom.proc/update_icon), 10)
 			else
-				icon_state = text("fireaxe[][][][]closing", !!fireaxe, localopened, hitstaken, smashed)
+				icon_state = text("fireaxe[][][][]closing", !!axe, localopened, hitstaken, smashed)
 				addtimer(CALLBACK(src, /atom.proc/update_icon), 10)
 
 /obj/structure/closet/fireaxecabinet/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
@@ -124,9 +125,9 @@
 	if(flags & NODECONSTRUCT)
 		return ..()
 
-	if(fireaxe)
-		fireaxe.forceMove(loc)
-		fireaxe = null
+	if(axe)
+		axe.forceMove(loc)
+		axe = null
 	new /obj/item/stack/sheet/metal(loc, 2)
 	if(!smashed)
 		new /obj/item/weapon/shard(loc)
@@ -143,9 +144,9 @@
 		return
 
 	if(localopened)
-		if(fireaxe)
-			user.try_take(fireaxe, loc)
-			fireaxe = null
+		if(axe)
+			user.try_take(axe, loc)
+			axe = null
 			to_chat(user, "<span class='notice'>You take the fire axe from the [name].</span>")
 			add_fingerprint(user)
 			update_icon()
@@ -155,19 +156,19 @@
 			else
 				localopened = !localopened
 				if(localopened)
-					icon_state = text("fireaxe[][][][]opening", !!fireaxe, localopened, hitstaken, smashed)
+					icon_state = text("fireaxe[][][][]opening", !!axe, localopened, hitstaken, smashed)
 					addtimer(CALLBACK(src, /atom.proc/update_icon), 10)
 				else
-					icon_state = text("fireaxe[][][][]closing", !!fireaxe, localopened, hitstaken, smashed)
+					icon_state = text("fireaxe[][][][]closing", !!axe, localopened, hitstaken, smashed)
 					addtimer(CALLBACK(src, /atom.proc/update_icon), 10)
 
 	else
 		localopened = !localopened //I'm pretty sure we don't need an if(src.smashed) in here. In case I'm wrong and it fucks up teh cabinet, **MARKER**. -Agouri
 		if(localopened)
-			icon_state = text("fireaxe[][][][]opening", !!fireaxe, localopened, hitstaken, smashed)
+			icon_state = text("fireaxe[][][][]opening", !!axe, localopened, hitstaken, smashed)
 			addtimer(CALLBACK(src, /atom.proc/update_icon), 10)
 		else
-			src.icon_state = text("fireaxe[][][][]closing", !!fireaxe, localopened, hitstaken, smashed)
+			src.icon_state = text("fireaxe[][][][]closing", !!axe, localopened, hitstaken, smashed)
 			addtimer(CALLBACK(src, /atom.proc/update_icon), 10)
 
 /obj/structure/closet/fireaxecabinet/attack_paw(mob/user)
@@ -184,10 +185,14 @@
 			to_chat(user, "<span class='notice'>Cabinet unlocked.</span>")
 
 /obj/structure/closet/fireaxecabinet/update_icon() // Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers
-	icon_state = text("fireaxe[][][][]", !!fireaxe, localopened, hitstaken, smashed)
+	icon_state = text("fireaxe[][][][]", !!axe, localopened, hitstaken, smashed)
 
 /obj/structure/closet/fireaxecabinet/open()
 	return
 
 /obj/structure/closet/fireaxecabinet/close()
 	return
+
+
+/obj/structure/closet/fireaxecabinet/hatchet
+	axe_type = /obj/item/weapon/hatchet

code/game/objects/structures/signs/signs_departments.dm

@@ -15,6 +15,16 @@
 	desc = "A sign labelling an area containing chemical equipment."
 	icon_state = "chemistry1"
 
+/obj/structure/sign/departments/pharmacy
+	name = "PHARMACY"
+	desc = "A sign labelling a pharmacy."
+	icon_state = "pharmacy"
+
+/obj/structure/sign/departments/morgue
+	name = "MORGUE"
+	desc = "A sign labelling a morgue."
+	icon_state = "morgue"
+
 /obj/structure/sign/departments/botany
 	name = "HYDROPONICS"
 	desc = "A sign labelling an area as a place where plants are grown."

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -533,3 +533,50 @@
 /obj/structure/stool/bed/chair/office/dark
 	icon_state = "officechair_dark"
 	behind = "officechair_dark_behind"
+
+/obj/structure/stool/bed/chair/weigher/floor
+	name = "Floor Weighter"
+	desc = "A device to measure weight."
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "weigher"
+	name = "chair"
+	buckle_lying = FALSE // force people to sit up in chairs when buckled
+
+/obj/structure/stool/bed/chair/weigher/floor/examine(mob/user)
+	if(buckled_mob)
+		if(ishuman(buckled_mob))
+			var/mob/living/carbon/human/H = buckled_mob
+			var/weight = 26.1
+			if(H.gender == MALE)
+				weight = 34.8
+			for(var/obj/item/organ/external/BP in H.bodyparts) // find a broken/destroyed limb
+				if(!BP.is_stump)
+					switch(BP.name)
+						if("head")
+							if(H.gender == MALE)
+								weight += 5.6
+							else
+								weight += 4.2
+						if("left arm")
+							if(H.gender == MALE)
+								weight += 3.92
+							else
+								weight += 2.94
+						if("right arm")
+							if(H.gender == MALE)
+								weight += 3.92
+							else
+								weight += 2.94
+						if("left leg")
+							if(H.gender == MALE)
+								weight += 15.84
+							else
+								weight += 11.88
+						if("right leg")
+							if(H.gender == MALE)
+								weight += 15.84
+							else
+								weight += 11.88
+			if(HAS_TRAIT(H, TRAIT_FAT))
+				weight *= 1.4
+			to_chat(user, "The [H]'s weight is [weight]kg, height is 1.8m")