Bug fixes

code/WorkInProgress/Mini/atmos_control.dm

@@ -68,6 +68,8 @@
 			continue
 		if(alarm.hidden)
 			continue
+		if(alarm.z != z)
+			continue
 		var/turf/pos = get_turf(alarm)
 		var/list/alarm_data=list()
 		alarm_data["ID"]="\ref[alarm]"

code/game/area/Space Station 13 areas.dm

@@ -1583,6 +1583,14 @@ area/security/podbay
 	name = "\improper Vault"
 	icon_state = "nuke_storage"
 
+/area/security/customs
+	name = "\improper Customs"
+	icon_state = "checkpoint1"
+
+/area/security/customs2
+	name = "\improper Customs"
+	icon_state = "security"	
+
 /area/security/checkpoint
 	name = "\improper Security Checkpoint"
 	icon_state = "checkpoint1"

code/game/jobs/job/medical.dm

@@ -48,7 +48,7 @@
 	selection_color = "#ffeef0"
 	access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
 	minimal_access = list(access_medical, access_morgue, access_surgery, access_maint_tunnels)
-	alt_titles = list("Surgeon","Nurse","Mortician")
+	alt_titles = list("Surgeon","Nurse","Coroner")
 	minimal_player_age = 3
 
 	equip(var/mob/living/carbon/human/H)
@@ -60,10 +60,11 @@
 			if(4) H.equip_or_collect(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		if (H.mind.role_alt_title)
 			switch(H.mind.role_alt_title)
-				if("Mortician")
+				if("Coroner")
 					H.equip_or_collect(new /obj/item/clothing/under/rank/medical/mortician(H), slot_w_uniform)
 					H.equip_or_collect(new /obj/item/clothing/suit/storage/labcoat/mortician(H), slot_wear_suit)
 					if(H.backbag != 1)
+						H.equip_or_collect(new /obj/item/clothing/head/surgery/black(H.back), slot_in_backpack)					
 						H.equip_or_collect(new /obj/item/weapon/autopsy_scanner(H.back), slot_in_backpack)
 						H.equip_or_collect(new /obj/item/device/mass_spectrometer(H.back), slot_in_backpack)
 						H.equip_or_collect(new /obj/item/weapon/storage/box/bodybags(H.back), slot_in_backpack)

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

@@ -12,6 +12,7 @@
 	name = "first-aid kit"
 	desc = "It's an emergency medical kit for those serious boo-boos."
 	icon_state = "firstaid"
+	icon_override = 'icons/mob/in-hand/medkits.dmi'	
 	throw_speed = 2
 	throw_range = 8
 	var/empty = 0

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

@@ -23,7 +23,7 @@
 		new /obj/item/blueprints(src)
 		new /obj/item/clothing/under/rank/chief_engineer(src)
 		new /obj/item/clothing/head/hardhat/white(src)
-		new /obj/item/clothing/head/welding(src)
+		new /obj/item/clothing/glasses/welding/superior(src)
 		new /obj/item/clothing/gloves/yellow(src)
 		new /obj/item/clothing/shoes/brown(src)
 		new /obj/item/weapon/cartridge/ce(src)

code/game/objects/structures/window.dm

@@ -18,7 +18,7 @@ var/global/wcColored
 		wcColored = 1
 
 	var/list/wcBarAreas = list(/area/crew_quarters/bar)
-	var/list/wcBrigAreas = list(/area/security,/area/security/main,/area/security/lobby,/area/security/brig,/area/security/permabrig,/area/security/prison,/area/security/prison/cell_block/A,/area/security/prison/cell_block/B,/area/security/prison/cell_block/C,/area/security/execution,/area/security/processing,/area/security/interrogation,/area/security/interrogationobs,/area/security/evidence,/area/security/prisonlockers,/area/security/medbay,/area/security/processing,/area/security/warden,/area/security/armoury,/area/security/securearmoury,/area/security/armoury/gamma,/area/security/securehallway,/area/security/hos,/area/security/podbay,/area/security/detectives_office,/area/security/range,/area/security/nuke_storage,/area/security/checkpoint,/area/security/checkpoint2,/area/security/checkpoint2,/area/security/checkpoint/supply,/area/security/checkpoint/engineering,/area/security/checkpoint/medical,/area/security/checkpoint/science,/area/security/vacantoffice,/area/security/vacantoffice2,/area/prison,/area/prison/arrival_airlock,/area/prison/control,/area/prison/crew_quarters,/area/prison/rec_room,/area/prison/closet,/area/prison/hallway/fore,/area/prison/hallway/aft,/area/prison/hallway/port,/area/prison/hallway/starboard,/area/prison/morgue,/area/prison/medical_research,/area/prison/medical,/area/prison/solar,/area/prison/podbay,/area/prison/solar_control,/area/prison/solitary,/area/prison/cell_block,/area/prison/cell_block/A,/area/prison/cell_block/B,/area/prison/cell_block/C,/area/shuttle/gamma/space,/area/shuttle/gamma/station)
+	var/list/wcBrigAreas = list(/area/security,/area/security/main,/area/security/lobby,/area/security/brig,/area/security/permabrig,/area/security/prison,/area/security/prison/cell_block/A,/area/security/prison/cell_block/B,/area/security/prison/cell_block/C,/area/security/execution,/area/security/processing,/area/security/interrogation,/area/security/interrogationobs,/area/security/evidence,/area/security/prisonlockers,/area/security/medbay,/area/security/processing,/area/security/warden,/area/security/armoury,/area/security/securearmoury,/area/security/armoury/gamma,/area/security/securehallway,/area/security/hos,/area/security/podbay,/area/security/detectives_office,/area/security/range,/area/security/nuke_storage,/area/security/customs,/area/security/customs2,/area/security/checkpoint,/area/security/checkpoint2,/area/security/checkpoint2,/area/security/checkpoint/supply,/area/security/checkpoint/engineering,/area/security/checkpoint/medical,/area/security/checkpoint/science,/area/security/vacantoffice,/area/security/vacantoffice2,/area/prison,/area/prison/arrival_airlock,/area/prison/control,/area/prison/crew_quarters,/area/prison/rec_room,/area/prison/closet,/area/prison/hallway/fore,/area/prison/hallway/aft,/area/prison/hallway/port,/area/prison/hallway/starboard,/area/prison/morgue,/area/prison/medical_research,/area/prison/medical,/area/prison/solar,/area/prison/podbay,/area/prison/solar_control,/area/prison/solitary,/area/prison/cell_block,/area/prison/cell_block/A,/area/prison/cell_block/B,/area/prison/cell_block/C,/area/shuttle/gamma/space,/area/shuttle/gamma/station)
 
 	var/newcolor
 	for(var/A in wcBarAreas)

code/game/turfs/simulated/floor_types.dm

@@ -226,17 +226,17 @@
 	name = "snow"
 	icon = 'icons/turf/snow.dmi'
 	icon_state = "snow"
-
-/turf/simulated/floor/plating/snow/concrete
-	name = "concrete"
-	icon = 'icons/turf/floors.dmi'
-	icon_state = "concrete"
-
-
-
+
 /turf/simulated/floor/plating/snow/ex_act(severity)
 	return
+
+/turf/simulated/floor/snow
+	name = "snow"
+	icon = 'icons/turf/snow.dmi'
+	icon_state = "snow"
 
+/turf/simulated/floor/snow/ex_act(severity)
+	return
 
 /turf/simulated/shuttle/plating/vox
 	oxygen=0 // BIRDS HATE OXYGEN FOR SOME REASON

code/game/turfs/unsimulated.dm

@@ -15,7 +15,6 @@
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "concrete"
 
-
 /turf/unsimulated/floor/plating/snow/ex_act(severity)
 	return
 

code/modules/clothing/head/jobs.dm

@@ -117,5 +117,5 @@
 	icon_state = "surgcap_green"
 
 /obj/item/clothing/head/surgery/black
-	desc = "A cap morticians wear during autopsies. Keeps their hair from falling into the cadavers.  It is as dark than the mortician's humor."
+	desc = "A cap coroners wear during autopsies. Keeps their hair from falling into the cadavers.  It is as dark than the mortician's humor."
 	icon_state = "surgcap_black"

code/modules/clothing/suits/labcoat.dm

@@ -5,7 +5,7 @@
 	item_state = "labcoat"
 	blood_overlay_type = "coat"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-	allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen)
+	allowed = list(/obj/item/device/analyzer,/obj/item/stack/medical,/obj/item/weapon/dnainjector,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/syringe,/obj/item/weapon/reagent_containers/hypospray,/obj/item/device/healthanalyzer,/obj/item/device/flashlight/pen,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/storage/pill_bottle,/obj/item/weapon/paper)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
 	species_fit = list("Vox")
 	sprite_sheets = list(
@@ -132,7 +132,7 @@
 		)
 
 /obj/item/clothing/suit/storage/labcoat/mortician
-	name = "Mortician Labcoat"
+	name = "Coroner Labcoat"
 	desc = "A suit that protects against minor chemical spills. Has a black stripe on the shoulder."
 	icon_state = "labcoat_mort_open"
 	species_fit = list("Vox")

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

@@ -177,7 +177,7 @@
 		)
 
 /obj/item/clothing/under/rank/medical/mortician
-	name = "mortician's scrubs"
+	name = "coroner's scrubs"
 	desc = "It's made of a special fiber that provides minor protection against biohazards. This one is as dark as an emo's poetry."
 	icon_state = "scrubsblack"
 	_color = "scrubsblack"

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

@@ -861,6 +861,9 @@
 								if(istype(usr,/mob/living/silicon/robot))
 									var/mob/living/silicon/robot/U = usr
 									R.fields[text("com_[counter]")] = text("Made by [U.name] ([U.modtype] [U.braintype]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]<BR>[t1]")
+								if(istype(usr,/mob/living/silicon/ai))
+									var/mob/living/silicon/ai/U = usr
+									R.fields[text("com_[counter]")] = text("Made by [U.name] (artificial intelligence) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]<BR>[t1]")
 
 	if (href_list["medical"])
 		if(hasHUD(usr,"medical"))

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

@@ -20,7 +20,6 @@
 				dead_mob_list -= src
 				respawnable_list -= src
 				living_mob_list += src
-				mob_list += src
 				stat = CONSCIOUS
 				ear_deaf = 0
 	return

code/modules/mob/living/living.dm

@@ -322,6 +322,7 @@
 	on_fire = 0
 	suiciding = 0
 	buckled = initial(src.buckled)
+
 	if(iscarbon(src))
 		var/mob/living/carbon/C = src
 		C.handcuffed = initial(C.handcuffed)
@@ -335,6 +336,9 @@
 	if(stat == 2)
 		dead_mob_list -= src
 		living_mob_list += src
+		tod = null
+		timeofdeath = 0
+
 	stat = CONSCIOUS
 	update_fire()
 	regenerate_icons()

code/modules/mob/living/say.dm

@@ -187,6 +187,7 @@ var/list/department_radio_keys = list(
 
 	if(traumatic_shock > 61 && prob(50))
 		message_mode = null //people in shock will have a high chance of not being able to speak on radio; needed since people don't instantly pass out at 100 damage.
+		src << "<span class='warning'>You try to use your radio, but you are in too much pain.</span>"
 
 	message = capitalize(message)
 

code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -257,6 +257,8 @@
 			stored_comms["glass"]++
 			stored_comms["glass"]++
 			stored_comms["glass"]++
+		else if (istype(W,/obj/item/weapon/light/tube) || istype(W,/obj/item/weapon/light/bulb))
+			stored_comms["glass"]++
 		else
 			continue
 

code/modules/organs/organ_external.dm

@@ -84,9 +84,9 @@
 
 		if(istype(owner,/mob/living/carbon/human))
 			var/mob/living/carbon/human/H = owner
-			if(H.species && H.species.flags & IS_SYNTHETIC)
-				brmod = H.species.brute_mod
-				bumod = H.species.burn_mod
+			if(H.species && H.species.flags & IS_SYNTHETIC) // No need for this - the modifer is being applied in the species' code already. Leaving it in, in case it ever changes.
+				brmod = 1 //H.species.brute_mod
+				bumod = 1 //H.species.burn_mod
 
 		brute *= brmod //~2/3 damage for ROBOLIMBS
 		burn *= bumod //~2/3 damage for ROBOLIMBS
@@ -137,9 +137,8 @@
 				burn = max(0, burn - can_inflict)
 		//If there are still hurties to dispense
 		if (burn || brute)
-			if (status & ORGAN_ROBOT)
-				if(body_part != UPPER_TORSO && body_part != LOWER_TORSO)          // as below, getting hit on the chest shouldn't gib you even if you've got a robotic chest
-					droplimb(1) //Robot limbs just kinda fail at full damage.
+			if (status & ORGAN_ROBOT && body_part != UPPER_TORSO && body_part != LOWER_TORSO)
+				droplimb(1) //Robot limbs just kinda fail at full damage.
 			else
 				//List organs we can pass it to
 				var/list/datum/organ/external/possible_points = list()

code/modules/research/designs.dm

@@ -1588,6 +1588,26 @@ datum/design/cyborg_analyzer
 	materials = list("$metal" = 30, "$glass" = 20)
 	reliability_base = 74
 	build_path = "/obj/item/device/robotanalyzer"
+
+datum/design/autopsy_scanner
+	name = "Autopsy Scanner"
+	desc = "A hand-held scanner able to extracts information from wounds."
+	id = "autopsy_scanner"
+	req_tech = list("programming" = 2, "biotech" = 2, "magnets" = 2)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 30, "$glass" = 20)
+	reliability_base = 74
+	build_path = "/obj/item/device/autopsy_scanner"
+
+datum/design/detective_scanner
+	name = "Forensic Scanner"
+	desc = "A hand-held scanner able to remotely scan objects and biomass for DNA and fingerprints."
+	id = "detective_scanner"
+	req_tech = list("programming" = 4, "biotech" = 3, "magnets" = 4)
+	build_type = PROTOLATHE
+	materials = list("$metal" = 30, "$glass" = 20)
+	reliability_base = 74
+	build_path = "/obj/item/device/detective_scanner"
 
 datum/design/mmi
 	name = "Man-Machine Interface"

data/mode.txt

@@ -1 +1 @@
-secret
+extended