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

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

@@ -250,7 +250,7 @@ var/global/list/default_medbay_channels = list(
 		return
 
 	var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(src, null, null, 1)
-	A.SetName(from)
+	A.rename_character(A.real_name, from)
 	Broadcast_Message(connection, A,
 						0, "*garbled automated announcement*", src,
 						message, from, "Automated Announcement", from, "synthesized voice",

code/game/objects/items/random_items.dm

@@ -88,7 +88,7 @@
 		..()
 		var/list/additional_drinks = list()
 		if(prob(50))
-			additional_drinks += list("pancuronium","adminordrazine","lsd","omnizine","blood")
+			additional_drinks += list("pancuronium","lsd","omnizine","blood")
 
 		var/datum/reagent/R = pick(drinks + additional_drinks)
 		reagents.add_reagent(R,volume)

code/game/objects/items/robot/robot_parts.dm

@@ -234,7 +234,7 @@
 			O.invisibility = 0
 			//Transfer debug settings to new mob
 			O.custom_name = created_name
-			O.updatename("Default")
+			O.rename_character(O.real_name, O.get_default_name())
 			O.locked = panel_locked
 			if(!aisync)
 				lawsync = 0

code/game/objects/items/robot/robot_upgrades.dm

@@ -31,7 +31,7 @@
 	qdel(R.module)
 	R.module = null
 	R.camera.network.Remove(list("Engineering","Medical","Mining Outpost"))
-	R.updatename("Default")
+	R.rename_character(R.real_name, R.get_default_name("Default"))
 	R.status_flags |= CANPUSH
 	R.languages = list()
 	R.speech_synthesizer_langs = list()

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -152,6 +152,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("apiary", /obj/item/apiary, 10, time = 25, one_per_turf = 0, on_floor = 0), \
 	new/datum/stack_recipe("easel", /obj/structure/easel, 3, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("wooden picture frame", /obj/item/weapon/picture_frame/wooden, 1), \
 	new/datum/stack_recipe("wooden buckler", /obj/item/weapon/shield/riot/buckler, 20, time = 40), \
 	)
 

code/game/objects/items/weapons/AI_modules.dm

@@ -150,7 +150,7 @@ AI MODULES
 /******************** ProtectStation ********************/
 /obj/item/weapon/aiModule/protectStation
 	name = "\improper 'ProtectStation' AI module"
-	desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized.'"
+	desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized.'"
 	origin_tech = "programming=3;materials=4" //made of gold
 
 /obj/item/weapon/aiModule/protectStation/attack_self(var/mob/user as mob)
@@ -158,7 +158,7 @@ AI MODULES
 
 /obj/item/weapon/aiModule/protectStation/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
 	..()
-	var/law = "Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized."
+	var/law = "Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized."
 	target << law
 	target.add_supplied_law(5, law)
 

code/game/objects/items/weapons/cigs.dm

@@ -49,6 +49,16 @@ LIGHTERS ARE IN LIGHTERS.DM
 	qdel(reagents)
 	return ..()
 
+/obj/item/clothing/mask/cigarette/attack(var/mob/living/M, var/mob/living/user, def_zone)
+	if(istype(M) && M.on_fire)
+		user.changeNext_move(CLICK_CD_MELEE)
+		user.do_attack_animation(M)
+		light("<span class='notice'>[user] coldly lights the [name] with the burning body of [M]. Clearly, they offer the warmest of regards...</span>")
+		return 1
+	else
+		return ..()
+
+
 /obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()
 	if(istype(W, /obj/item/weapon/weldingtool))

code/game/objects/items/weapons/defib.dm

@@ -12,6 +12,10 @@
 	w_class = 4
 	origin_tech = "biotech=4"
 	action_button_name = "Toggle Paddles"
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/back.dmi'
+		)
 
 	var/on = 0 //if the paddles are equipped (1) or on the defib (0)
 	var/safety = 1 //if you can zap people with the defibs on harm mode
@@ -342,6 +346,13 @@
 				user.visible_message("<span class='notice'>[user] places [src] on [M.name]'s chest.</span>", "<span class='warning'>You place [src] on [M.name]'s chest.</span>")
 				playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0)
 				var/mob/dead/observer/ghost = H.get_ghost()
+				if(ghost && !ghost.client)
+					// In case the ghost's not getting deleted for some reason
+					H.key = ghost.key
+					log_to_dd("Ghost of name [ghost.name] is bound to [H.real_name], but lacks a client. Deleting ghost.")
+
+					qdel(ghost)
+					ghost = null
 				var/tplus = world.time - H.timeofdeath
 				var/tlimit = 6000 //past this much time the patient is unrecoverable (in deciseconds)
 				var/tloss = 3000 //brain damage starts setting in on the patient after some time left rotting
@@ -387,11 +398,12 @@
 								user.visible_message("<span class='boldnotice'>[defib] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation.</span>")
 							else if(total_burn >= 180 || total_brute >= 180)
 								user.visible_message("<span class='boldnotice'>[defib] buzzes: Resuscitation failed - Severe tissue damage detected.</span>")
+							else if(ghost)
+								user.visible_message("<span class='notice'>[defib] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.</span>")
+								ghost << "<span class='ghostalert'>Your heart is being defibrillated. Return to your body if you want to be revived!</span> (Verbs -> Ghost -> Re-enter corpse)"
+								ghost << sound('sound/effects/genetics.ogg')
 							else
 								user.visible_message("<span class='notice'>[defib] buzzes: Resuscitation failed.</span>")
-								if(ghost)
-									ghost << "<span class='ghostalert'>Your heart is being defibrillated. Return to your body if you want to be revived!</span> (Verbs -> Ghost -> Re-enter corpse)"
-									ghost << sound('sound/effects/genetics.ogg')
 							playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
 							defib.deductcharge(revivecost)
 						update_icon()
@@ -461,6 +473,13 @@
 				user.visible_message("<span class='notice'>[user] places [src] on [M.name]'s chest.</span>", "<span class='warning'>You place [src] on [M.name]'s chest.</span>")
 				playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0)
 				var/mob/dead/observer/ghost = H.get_ghost()
+				if(ghost && !ghost.client)
+					// In case the ghost's not getting deleted for some reason
+					H.key = ghost.key
+					log_to_dd("Ghost of name [ghost.name] is bound to [H.real_name], but lacks a client. Deleting ghost.")
+
+					qdel(ghost)
+					ghost = null
 				var/tplus = world.time - H.timeofdeath
 				var/tlimit = 6000 //past this much time the patient is unrecoverable (in deciseconds)
 				var/tloss = 3000 //brain damage starts setting in on the patient after some time left rotting
@@ -484,7 +503,7 @@
 							H.adjustBruteLoss(tobehealed)
 							user.visible_message("<span class='notice'>[user] pings: Resuscitation successful.</span>")
 							playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0)
-							H.stat = 1
+							H.stat = UNCONSCIOUS
 							H.update_revive()
 							H.emote("gasp")
 							if(tplus > tloss)
@@ -498,11 +517,12 @@
 								user.visible_message("<span class='warning'>[user] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation.</span>")
 							else if(total_burn >= 180 || total_brute >= 180)
 								user.visible_message("<span class='warning'>[user] buzzes: Resuscitation failed - Severe tissue damage detected.</span>")
+							else if(ghost)
+								user.visible_message("<span class='notice'>[user] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.</span>")
+								ghost << "<span class='ghostalert'>Your heart is being defibrillated. Return to your body if you want to be revived!</span> (Verbs -> Ghost -> Re-enter corpse)"
+								ghost << sound('sound/effects/genetics.ogg')
 							else
 								user.visible_message("<span class='warning'>[user] buzzes: Resuscitation failed.</span>")
-								if(ghost)
-									ghost << "<span class='ghostalert'>Your heart is being defibrillated. Return to your body if you want to be revived!</span> (Verbs -> Ghost -> Re-enter corpse)"
-									ghost << sound('sound/effects/genetics.ogg')
 							playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
 							if(isrobot(user))
 								var/mob/living/silicon/robot/R = user

code/game/objects/items/weapons/mop.dm

@@ -65,6 +65,12 @@
 	J.mymop=src
 	J.update_icon()
 
+/obj/item/weapon/mop/wash(mob/user, atom/source)
+	reagents.add_reagent("water", 5)
+	user << "<span class='notice'>You wet [src] in [source].</span>"
+	playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+	return 1
+
 /obj/item/weapon/mop/advanced
 	desc = "The most advanced tool in a custodian's arsenal. Just think of all the viscera you will clean up with this!"
 	name = "advanced mop"

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

@@ -15,6 +15,10 @@
 	max_w_class = 3
 	max_combined_w_class = 21
 	storage_slots = 21
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/back.dmi'
+		)
 
 /obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	playsound(src.loc, "rustle", 50, 1, -5)
@@ -43,10 +47,10 @@
 		else if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail)
 			var/response = alert(user, "Are you sure you want to put the bag of holding inside another bag of holding?","Are you sure you want to die?","Yes","No")
 			if(response == "Yes")
-				user.visible_message("<span class='warning'>[user] grins as he begins to put a Bag of Holding into a Bag of Holding!</span>", "<span class='warning'>You begin to put the Bag of Holding into the Bag of Holding!</span>")
+				user.visible_message("<span class='warning'>[user] grins as \he begins to put a Bag of Holding into a Bag of Holding!</span>", "<span class='warning'>You begin to put the Bag of Holding into the Bag of Holding!</span>")
 				if(do_after(user,30,target=src))
 					investigate_log("has become a singularity. Caused by [user.key]","singulo")
-					user.visible_message("<span class='warning'>[user] erupts in evil laughter as he puts the Bag of Holding into another Bag of Holding!</span>", "<span class='warning'>You can't help yourself from laughing as you put the Bag of Holding into another Bag of Holding, complete darkness surrounding you</span>","<span class='warning'> You hear the sound of scientific evil brewing! </span>")
+					user.visible_message("<span class='warning'>[user] erupts in evil laughter as \he puts the Bag of Holding into another Bag of Holding!</span>", "<span class='warning'>You can't help but laugh wildly as you put the Bag of Holding into another Bag of Holding, complete darkness surrounding you.</span>","<span class='warning'> You hear the sound of scientific evil brewing! </span>")
 					qdel(W)
 					var/obj/singularity/singulo = new /obj/singularity(get_turf(user))
 					singulo.energy = 300 //To give it a small boost
@@ -54,7 +58,7 @@
 					log_game("[key_name(user)] detonated a bag of holding")
 					qdel(src)
 				else
-					user.visible_message("After careful consideration, [user] has decided that putting a Bag of Holding inside another Bag of Holding would not yield the ideal outcome","You come to the realization that this might not be the greatest idea")
+					user.visible_message("After careful consideration, [user] has decided that putting a Bag of Holding inside another Bag of Holding would not yield the ideal outcome.","You come to the realization that this might not be the greatest idea.")
 		else
 			. = ..()
 
@@ -77,7 +81,7 @@
 
 /obj/item/weapon/storage/backpack/santabag
 	name = "Santa's Gift Bag"
-	desc = "Space Santa uses this to deliver toys to all the nice children in space in Christmas! Wow, it's pretty big!"
+	desc = "Space Santa uses this to deliver toys to all the nice children in space on Christmas! Wow, it's pretty big!"
 	icon_state = "giftbag0"
 	item_state = "giftbag"
 	w_class = 4.0
@@ -169,7 +173,6 @@
 	desc = "An NT Deluxe satchel, with the finest quality leather and the company logo in a thin gold stitch"
 	icon_state = "nt_deluxe"
 
-
 /obj/item/weapon/storage/backpack/satchel/withwallet
 	New()
 		..()
@@ -324,7 +327,6 @@
 	icon_state = "duffel-captain"
 	item_state = "duffel-captain"
 
-
 /obj/item/weapon/storage/backpack/duffel/security
 	name = "security duffelbag"
 	desc = "A duffelbag built with robust fabric!"
@@ -344,13 +346,13 @@
 	item_state = "duffel-toxins"
 
 /obj/item/weapon/storage/backpack/duffel/genetics
-	name = "scientist duffelbag"
+	name = "geneticist duffelbag"
 	desc = "A duffelbag designed to hold gibbering monkies."
-	icon_state = "duffel-toxins"
-	item_state = "duffel-toxins"
+	icon_state = "duffel-gene"
+	item_state = "duffel-gene"
 
 /obj/item/weapon/storage/backpack/duffel/chemistry
-	name = "scientist duffelbag"
+	name = "chemist duffelbag"
 	desc = "A duffelbag designed to hold corrosive substances."
 	icon_state = "duffel-chemistry"
 	item_state = "duffel-chemistry"

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

@@ -52,6 +52,13 @@
 			..()
 		return
 
+/obj/item/weapon/storage/lockbox/can_be_inserted(obj/item/W as obj, stop_messages = 0)
+	if(!locked)
+		return ..()
+	if(!stop_messages)
+		usr << "<span class='notice'>[src] is locked!</span>"
+	return 0
+
 /obj/item/weapon/storage/lockbox/emag_act(user as mob)
 	if(!broken)
 		broken = 1

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

@@ -140,6 +140,14 @@
 				return
 		return
 
+/obj/item/weapon/storage/secure/can_be_inserted(obj/item/W as obj, stop_messages = 0)
+	if(!locked)
+		return ..()
+	if(!stop_messages)
+		usr << "<span class='notice'>[src] is locked!</span>"
+	return 0
+
+
 // -----------------------------
 //        Secure Briefcase
 // -----------------------------

code/game/objects/items/weapons/stunbaton.dm

@@ -163,6 +163,21 @@
 			bcell.reliability -= 10 / severity
 	..()
 
+/obj/item/weapon/melee/baton/wash(mob/user, atom/source)
+	if(bcell)
+		if(bcell.charge > 0 && status == 1)
+			flick("baton_active", source)
+			user.Stun(stunforce)
+			user.Weaken(stunforce)
+			user.stuttering = stunforce
+			deductcharge(hitcost)
+			user.visible_message("<span class='warning'>[user] shocks themself while attempting to wash the active [src]!</span>", \
+								"<span class='userdanger'>You unwisely attempt to wash [src] while it's still on.</span>")
+			playsound(src, "sparks", 50, 1)
+			return 1
+	..()
+
+
 //secborg stun baton module
 /obj/item/weapon/melee/baton/loaded/robot
 	hitcost = 1000