Merge remote-tracking branch 'remotes/upstream/master' into tanksprites

# Conflicts: # icons/mob/inhands/items_lefthand.dmi # icons/mob/inhands/items_righthand.dmi
2026-07-19 11:05:03 +01:00 · 2017-02-13 21:01:58 +04:00
parent c12212a2a5 d53434d3d3
commit c4dd6f533f
228 changed files with 5111 additions and 2423 deletions
@@ -117,9 +117,9 @@ var/global/list/image/splatter_cache=list()
 		user.hand_blood_color = basecolor
 		user.update_inv_gloves(1)
 		user.verbs += /mob/living/carbon/human/proc/bloody_doodle
-		
+
 /obj/effect/decal/cleanable/blood/can_bloodcrawl_in()
-	return amount
+	return TRUE

 /obj/effect/decal/cleanable/blood/splatter
 	random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5")
@@ -750,7 +750,7 @@ steam.start() -- spawns the effect
 				var/obj/effect/effect/ion_trails/I = new /obj/effect/effect/ion_trails(src.oldposition)
 				I.dir = src.holder.dir
 				flick("ion_fade", I)
-				I.icon_state = "blank"
+				I.icon_state = ""
 				spawn( 20 )
 					if(I)
 						I.delete()
@@ -812,8 +812,8 @@ steam.start() -- spawns the effect
 					II.dir = src.holder.dir
 					flick("ion_fade", I)
 					flick("ion_fade", II)
-					I.icon_state = "blank"
-					II.icon_state = "blank"
+					I.icon_state = ""
+					II.icon_state = ""
 					spawn( 20 )
 						if(I) I.delete()
 						if(II) II.delete()
@@ -113,6 +113,18 @@
 	layer = 4.1
 	duration = 4
 	
+/obj/effect/overlay/temp/explosion
+	name = "explosion"
+	icon = 'icons/effects/96x96.dmi'
+	icon_state = "explosion"
+	pixel_x = -32
+	pixel_y = -32
+	duration = 8
+
+/obj/effect/overlay/temp/explosion/fast
+	icon_state = "explosionfast"
+	duration = 4
+	
 /obj/effect/overlay/temp/decoy
 	desc = "It's a decoy!"
 	duration = 15
@@ -194,6 +194,6 @@
 				/obj/item/weapon/stock_parts/scanning_module = 1,
 				/obj/item/weapon/spacecash/c200 = 1,
 				/obj/item/weapon/airlock_electronics = 1,
-				/obj/item/weapon/gun/energy/kinetic_accelerator/super = 1,
+				/obj/item/weapon/gun/energy/kinetic_accelerator = 1,
 				/obj/item/pizzabox = 3,
 				)
@@ -77,7 +77,7 @@
 	drawtype = temp
 	update_window(usr)

-/obj/item/toy/crayon/afterattack(atom/target, mob/user as mob, proximity)
+/obj/item/toy/crayon/afterattack(atom/target, mob/user, proximity)
 	if(!proximity) return
 	if(is_type_in_list(target,validSurfaces))
 		var/temp = "rune"
@@ -95,17 +95,22 @@
 				if(!uses)
 					to_chat(user, "<span class='danger'>You used up your [name]!</span>")
 					qdel(src)
-	return

-/obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob)
+/obj/item/toy/crayon/attack(mob/M, mob/user)
 	var/huffable = istype(src,/obj/item/toy/crayon/spraycan)
 	if(M == user)
-		to_chat(user, "You take a [huffable ? "huff" : "bite"] of the [name]. Delicious!")
+		if(ishuman(user))
+			var/mob/living/carbon/human/H = user
+			if(!H.check_has_mouth())
+				to_chat(user, "<span class='warning'>You do not have a mouth!</span>")
+				return
+		playsound(loc, 'sound/items/eatfood.ogg', 50, 0)
+		to_chat(user, "<span class='notice'>You take a [huffable ? "huff" : "bite"] of the [name]. Delicious!</span>")
 		user.nutrition += 5
 		if(uses)
 			uses -= 5
 			if(uses <= 0)
-				to_chat(user, "<span class='danger'>There is no more of [name] left!</span>")
+				to_chat(user, "<span class='warning'>There is no more of [name] left!</span>")
 				qdel(src)
 	else
 		..()
@@ -54,8 +54,8 @@
 			return

 		var/mob/living/carbon/human/H = M	//mob has protective eyewear
-		if(istype(M, /mob/living/carbon/human) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
-			to_chat(user, "<span class='notice'>You're going to need to remove that [(H.head && H.head.flags & HEADCOVERSEYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) ? "mask": "glasses"] first.</span>")
+		if(istype(H) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
+			to_chat(user, "<span class='notice'>You're going to need to remove that [(H.head && H.head.flags & HEADCOVERSEYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) ? "mask" : "glasses"] first.</span>")
 			return

 		if(M == user)	//they're using it on themselves
@@ -70,12 +70,13 @@
 			user.visible_message("<span class='notice'>[user] directs [src] to [M]'s eyes.</span>", \
 								 "<span class='notice'>You direct [src] to [M]'s eyes.</span>")

-			if(istype(M, /mob/living/carbon/human))	//robots and aliens are unaffected
-				if(M.stat == DEAD || M.disabilities & BLIND)	//mob is dead or fully blind
-					to_chat(user, "<span class='notice'>[M] pupils does not react to the light!</span>")
-				else if(XRAY in M.mutations)	//mob has X-RAY vision
-					to_chat(user, "<span class='notice'>[M] pupils give an eerie glow!</span>")
-				else	//they're okay!
+			if(istype(H)) //robots and aliens are unaffected
+				var/obj/item/organ/internal/eyes/eyes = H.get_int_organ(/obj/item/organ/internal/eyes)
+				if(M.stat == DEAD || !eyes || M.disabilities & BLIND)	//mob is dead or fully blind
+					to_chat(user, "<span class='notice'>[M]'s pupils are unresponsive to the light!</span>")
+				else if((XRAY in M.mutations) || (eyes.colourblind_darkview && eyes.colourblind_darkview == eyes.get_dark_view())) //The mob's either got the X-RAY vision or has a tapetum lucidum (extreme nightvision, i.e. Vulp/Tajara with COLOURBLIND & their monkey forms).
+					to_chat(user, "<span class='notice'>[M]'s pupils glow eerily!</span>")
+				else //they're okay!
 					if(M.flash_eyes(visual = 1))
 						to_chat(user, "<span class='notice'>[M]'s pupils narrow.</span>")
 	else
@@ -25,10 +25,7 @@
 	ui_interact(user)

 /obj/item/device/guitar/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	if(!user)
-		return
-
-	if(!isliving(user) || user.stat || user.restrained() || user.lying)
+	if(!isliving(user) || user.incapacitated())
 		return

 	song.ui_interact(user, ui_key, ui, force_open)
@@ -11,11 +11,16 @@
 	var/obj/item/device/radio/radio
 	var/looking_for_personality = 0
 	var/mob/living/silicon/pai/pai
+	var/list/faction = list("neutral") // The factions the pAI will inherit from the card
+	
+/obj/item/device/paicard/syndicate
+	name = "syndicate personal AI device"
+	faction = list("syndicate")

 /obj/item/device/paicard/relaymove(var/mob/user, var/direction)
 	if(user.stat || user.stunned)
 		return
-	var/obj/item/weapon/rig/rig = src.get_rig()
+	var/obj/item/weapon/rig/rig = get_rig()
 	if(istype(rig))
 		rig.forced_move(direction, user)

@@ -260,7 +265,7 @@
 			to_chat(usr, "\red The request system is currently offline. Please wait another [cooldown_time] seconds.")
 			return
 		last_request = world.time / 10
-		src.looking_for_personality = 1
+		looking_for_personality = 1
 		paiController.findPAI(src, usr)
 	if(href_list["wipe"])
 		var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No")
@@ -297,33 +302,33 @@
 //		WIRE_TRANSMIT = 4

 /obj/item/device/paicard/proc/setPersonality(mob/living/silicon/pai/personality)
-	src.pai = personality
-	src.overlays += "pai-happy"
+	pai = personality
+	overlays += "pai-happy"

 /obj/item/device/paicard/proc/removePersonality()
-	src.pai = null
-	src.overlays.Cut()
-	src.overlays += "pai-off"
+	pai = null
+	overlays.Cut()
+	overlays += "pai-off"

 /obj/item/device/paicard
 	var/current_emotion = 1
 /obj/item/device/paicard/proc/setEmotion(var/emotion)
 	if(pai)
-		src.overlays.Cut()
+		overlays.Cut()
 		switch(emotion)
-			if(1) src.overlays += "pai-happy"
-			if(2) src.overlays += "pai-cat"
-			if(3) src.overlays += "pai-extremely-happy"
-			if(4) src.overlays += "pai-face"
-			if(5) src.overlays += "pai-laugh"
-			if(6) src.overlays += "pai-off"
-			if(7) src.overlays += "pai-sad"
-			if(8) src.overlays += "pai-angry"
-			if(9) src.overlays += "pai-what"
+			if(1) overlays += "pai-happy"
+			if(2) overlays += "pai-cat"
+			if(3) overlays += "pai-extremely-happy"
+			if(4) overlays += "pai-face"
+			if(5) overlays += "pai-laugh"
+			if(6) overlays += "pai-off"
+			if(7) overlays += "pai-sad"
+			if(8) overlays += "pai-angry"
+			if(9) overlays += "pai-what"
 		current_emotion = emotion

 /obj/item/device/paicard/proc/alertUpdate()
-	var/turf/T = get_turf_or_move(src.loc)
+	var/turf/T = get_turf_or_move(loc)
 	for(var/mob/M in viewers(T))
 		M.show_message("\blue [src] flashes a message across its screen, \"Additional personalities available for download.\"", 3, "\blue [src] bleeps electronically.", 2)

@@ -30,10 +30,7 @@
 	ui_interact(user)

 /obj/item/device/violin/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	if(!user)
-		return
-
-	if(!isliving(user) || user.stat || user.restrained() || user.lying)
+	if(!isliving(user) || user.incapacitated())
 		return

 	song.ui_interact(user, ui_key, ui, force_open)
@@ -196,25 +196,6 @@

 	return 1

-/obj/item/borg/upgrade/hyperka
-	name = "mining cyborg hyper-kinetic accelerator"
-	desc = "A satchel of holding replacement for mining cyborg's ore satchel module."
-	icon_state = "cyborg_upgrade3"
-	require_module = 1
-	module_type = /obj/item/weapon/robot_module/miner
-
-/obj/item/borg/upgrade/hyperka/action(mob/living/silicon/robot/R)
-	if(..())
-		return
-
-	for(var/obj/item/weapon/gun/energy/kinetic_accelerator/cyborg/H in R.module.modules)
-		qdel(H)
-
-	R.module.modules += new /obj/item/weapon/gun/energy/kinetic_accelerator/hyper/cyborg(R.module)
-	R.module.rebuild()
-
-	return 1
-
 /obj/item/borg/upgrade/syndicate
 	name = "illegal equipment module"
 	desc = "Unlocks the hidden, deadlier functions of a cyborg"
@@ -7,7 +7,7 @@ RCD
 /obj/item/weapon/rcd
 	name = "rapid-construction-device (RCD)"
 	desc = "A device used to rapidly build and deconstruct walls and floors."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/tools.dmi'
 	icon_state = "rcd"
 	opacity = 0
 	density = 0
@@ -6,8 +6,8 @@ RSF
 /obj/item/weapon/rsf
 	name = "\improper Rapid-Service-Fabricator"
 	desc = "A device used to rapidly deploy service items."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "rcd"
+	icon = 'icons/obj/tools.dmi'
+	icon_state = "rsf"
 	opacity = 0
 	density = 0
 	anchored = 0.0
@@ -87,7 +87,7 @@
 	target.apply_damage(force * fisto_setting, BRUTE)
 	target.visible_message("<span class='danger'>[user]'s powerfist lets out a loud hiss as they punch [target.name]!</span>", \
 		"<span class='userdanger'>You cry out in pain as [user]'s punch flings you backwards!</span>")
-	new/obj/effect/kinetic_blast(target.loc)
+	new /obj/effect/overlay/temp/kinetic_blast(target.loc)
 	playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
 	playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)

@@ -12,47 +12,42 @@
 *		Revolver Conversion Kit
 */

-/*
- * Wrench
- */
+//Wrench
 /obj/item/weapon/wrench
 	name = "wrench"
 	desc = "A wrench with common uses. Can be found in your hand."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/tools.dmi'
 	icon_state = "wrench"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	force = 5.0
-	throwforce = 7.0
+	force = 5
+	throwforce = 7
 	w_class = 2
 	materials = list(MAT_METAL=150)
 	origin_tech = "materials=1;engineering=1"
 	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")

-
-/*
- * Screwdriver
- */
+//Screwdriver
 /obj/item/weapon/screwdriver
 	name = "screwdriver"
 	desc = "You can be totally screwy with this."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/tools.dmi'
 	icon_state = "screwdriver"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	force = 5.0
+	force = 5
 	w_class = 1
-	throwforce = 5.0
+	throwforce = 5
 	throw_speed = 3
 	throw_range = 5
 	materials = list(MAT_METAL=75)
 	attack_verb = list("stabbed")
 	hitsound = 'sound/weapons/bladeslice.ogg'

-	suicide_act(mob/user)
-		to_chat(viewers(user), pick("<span class='suicide'>[user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.</span>", \
-									"<span class='suicide'>[user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.</span>"))
-		return(BRUTELOSS)
+/obj/item/weapon/screwdriver/suicide_act(mob/user)
+	to_chat(viewers(user), pick("<span class='suicide'>[user] is stabbing the [name] into \his temple! It looks like \he's trying to commit suicide.</span>", \
+								"<span class='suicide'>[user] is stabbing the [name] into \his heart! It looks like \he's trying to commit suicide.</span>"))
+	return(BRUTELOSS)

 /obj/item/weapon/screwdriver/New()
 	switch(pick("red","blue","purple","brown","green","cyan","yellow"))
@@ -82,7 +77,7 @@
 		src.pixel_y = rand(0, 16)
 	return

-/obj/item/weapon/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+/obj/item/weapon/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user)
 	if(!istype(M) || user.a_intent == I_HELP)
 		return ..()
 	if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head")
@@ -91,17 +86,15 @@
 		M = user
 	return eyestab(M,user)

-/*
- * Wirecutters
- */
+//Wirecutters
 /obj/item/weapon/wirecutters
 	name = "wirecutters"
 	desc = "This cuts wires."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/tools.dmi'
 	icon_state = "cutters"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	force = 6.0
+	force = 6
 	throw_speed = 3
 	throw_range = 7
 	w_class = 2
@@ -112,51 +105,40 @@
 	sharp = 1
 	edge = 1

-/obj/item/weapon/wirecutters/New(loc, var/param_color = null)
+/obj/item/weapon/wirecutters/New(loc, param_color = null)
 	..()
 	if((!param_color && prob(50)) || param_color == "yellow")
 		icon_state = "cutters-y"
 		item_state = "cutters_yellow"

-/obj/item/weapon/wirecutters/attack(mob/living/carbon/human/C as mob, mob/user as mob)
-	if(istype(C) && C.handcuffed)
-		if(istype(C.handcuffed, /obj/item/weapon/restraints/handcuffs/cable))
-			usr.visible_message("\The [usr] cuts \the [C]'s restraints with \the [src]!",\
-			"You cut \the [C]'s restraints with \the [src]!",\
+/obj/item/weapon/wirecutters/attack(mob/living/carbon/human/H, mob/user)
+	if(istype(H) && H.handcuffed)
+		if(istype(H.handcuffed, /obj/item/weapon/restraints/handcuffs/cable))
+			usr.visible_message("\The [usr] cuts \the [H]'s restraints with \the [src]!",\
+			"You cut \the [H]'s restraints with \the [src]!",\
 			"You hear cable being cut.")
-			C.handcuffed = null
-			if(C.buckled && C.buckled.buckle_requires_restraints)
-				C.buckled.unbuckle_mob()
-			C.update_handcuffed()
+			H.handcuffed = null
+			if(H.buckled && H.buckled.buckle_requires_restraints)
+				H.buckled.unbuckle_mob()
+			H.update_handcuffed()
 			return
 	else
 		..()

-/*
- * Welding Tool
- */
+//Welding Tool
 /obj/item/weapon/weldingtool
 	name = "welding tool"
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/tools.dmi'
 	icon_state = "welder"
-	item_state = "welder"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-
-	//Amount of OUCH when it's thrown
 	force = 3
 	throwforce = 5
 	throw_speed = 3
 	throw_range = 5
 	w_class = 2
-
-	//Cost to make in the autolathe
 	materials = list(MAT_METAL=70, MAT_GLASS=30)
-
-	//R&D tech level
 	origin_tech = "engineering=1"
-
-	//Welding tool specific stuff
 	var/welding = 0 	//Whether or not the welding tool is off(0), on(1) or currently welding(2)
 	var/status = 1 		//Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower)
 	var/max_fuel = 20 	//The max amount of fuel the welder can hold
@@ -198,8 +180,8 @@
 	update_torch()
 	return

-/obj/item/weapon/weldingtool/attackby(obj/item/I as obj, mob/user as mob, params)
-	if(istype(I, /obj/item/weapon/screwdriver))
+/obj/item/weapon/weldingtool/attackby(obj/item/I, mob/user, params)
+	if(isscrewdriver(I))
 		flamethrower_screwdriver(I, user)
 	if(istype(I, /obj/item/stack/rods))
 		flamethrower_rods(I, user)
@@ -231,7 +213,7 @@
 	if(isturf(location))
 		location.hotspot_expose(700, 5)

-/obj/item/weapon/weldingtool/attack(mob/M as mob, mob/user as mob)
+/obj/item/weapon/weldingtool/attack(mob/M, mob/user)
 	if(ishuman(M))
 		var/mob/living/carbon/human/H = M
 		var/obj/item/organ/external/S = H.organs_by_name[user.zone_sel.selecting]
@@ -289,7 +271,7 @@
 	return reagents.get_reagent_amount("fuel")

 //Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use()
-/obj/item/weapon/weldingtool/proc/remove_fuel(var/amount = 1, var/mob/living/M = null)
+/obj/item/weapon/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null)
 	if(!welding || !check_fuel())
 		return 0
 	if(get_fuel() >= amount)
@@ -379,6 +361,7 @@
 	name = "Industrial Welding Tool"
 	desc = "A slightly larger welder with a larger tank."
 	icon_state = "indwelder"
+	icon_state = "welder"
 	max_fuel = 40
 	materials = list(MAT_METAL=70, MAT_GLASS=60)
 	origin_tech = "engineering=2"
@@ -402,9 +385,8 @@

 /obj/item/weapon/weldingtool/hugetank
 	name = "Upgraded Welding Tool"
-	desc = "An upgraded welder based of the industrial welder."
+	desc = "An upgraded welder based off the industrial welder."
 	icon_state = "upindwelder"
-	item_state = "upindwelder"
 	max_fuel = 80
 	w_class = 3
 	materials = list(MAT_METAL=70, MAT_GLASS=120)
@@ -414,15 +396,14 @@
 	name = "Experimental Welding Tool"
 	desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes."
 	icon_state = "exwelder"
-	item_state = "exwelder"
 	max_fuel = 40
 	w_class = 3
 	materials = list(MAT_METAL=70, MAT_GLASS=120)
 	origin_tech = "engineering=4;plasmatech=3"
-	var/last_gen = 0
 	change_icons = 0
 	can_off_process = 1
 	light_intensity = 1
+	var/last_gen = 0

 /obj/item/weapon/weldingtool/experimental/proc/fuel_gen()
 	if(!welding && !last_gen)
@@ -436,19 +417,16 @@
 	if(reagents.total_volume < max_fuel)
 		fuel_gen()

-/*
- * Crowbar
- */
-
+//Crowbar
 /obj/item/weapon/crowbar
 	name = "pocket crowbar"
 	desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors."
-	icon = 'icons/obj/items.dmi'
+	icon = 'icons/obj/tools.dmi'
 	icon_state = "crowbar"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
-	force = 5.0
-	throwforce = 7.0
+	force = 5
+	throwforce = 7
 	item_state = "crowbar"
 	w_class = 2
 	materials = list(MAT_METAL=50)
@@ -456,7 +434,6 @@
 	attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")

 /obj/item/weapon/crowbar/red
-	icon = 'icons/obj/items.dmi'
 	icon_state = "red_crowbar"
 	item_state = "crowbar_red"

@@ -480,14 +457,14 @@
 	origin_tech = "combat=2"
 	var/open = 0

-	New()
-		..()
-		update_icon()
-
+/obj/item/weapon/conversion_kit/New()
+	..()
 	update_icon()
-		icon_state = "[initial(icon_state)]_[open]"

-	attack_self(mob/user as mob)
-		open = !open
-		to_chat(user, "\blue You [open?"open" : "close"] the conversion kit.")
-		update_icon()
+/obj/item/weapon/conversion_kit/update_icon()
+	icon_state = "[initial(icon_state)]_[open]"
+
+/obj/item/weapon/conversion_kit/attack_self(mob/user)
+	open = !open
+	to_chat(user, "\blue You [open?"open" : "close"] the conversion kit.")
+	update_icon()
@@ -23,18 +23,14 @@
 	slot_flags = SLOT_BELT
 	force = 2
 	throwforce = 1
-	sharp = 1
-	edge = 1
 	w_class = 3
+	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")

-	suicide_act(mob/user)
-		to_chat(viewers(user), "<span class='suicide'>[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.</span>")
-		return(BRUTELOSS)
-
-/obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
-	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
-	return ..()
+/obj/item/weapon/sord/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is trying to impale themself with [src]! It might be a suicide attempt if it weren't so shitty.</span>", \
+	"<span class='suicide'>You try to impale yourself with [src], but it's USELESS...</span>")
+	return SHAME

 /obj/item/weapon/claymore
 	name = "claymore"
@@ -3,7 +3,7 @@
 /obj/structure/closet/crate
 	name = "crate"
 	desc = "A rectangular steel crate."
-	icon = 'icons/obj/storage.dmi'
+	icon = 'icons/obj/crates.dmi'
 	icon_state = "crate"
 	icon_opened = "crateopen"
 	icon_closed = "crate"
@@ -490,7 +490,6 @@
 /obj/structure/closet/crate/large
 	name = "large crate"
 	desc = "A hefty metal crate."
-	icon = 'icons/obj/storage.dmi'
 	icon_state = "largemetal"
 	icon_opened = "largemetalopen"
 	icon_closed = "largemetal"
@@ -515,7 +514,6 @@
 /obj/structure/closet/crate/secure/large
 	name = "large crate"
 	desc = "A hefty metal crate with an electronic locking system."
-	icon = 'icons/obj/storage.dmi'
 	icon_state = "largemetal"
 	icon_opened = "largemetalopen"
 	icon_closed = "largemetal"
@@ -1,8 +1,8 @@
 /obj/structure/largecrate
 	name = "large crate"
 	desc = "A hefty wooden crate."
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "densecrate"
+	icon = 'icons/obj/crates.dmi'
+	icon_state = "largecrate"
 	density = 1
 	var/obj/item/weapon/paper/manifest/manifest

@@ -49,7 +49,6 @@
 		return attack_hand(user)

 /obj/structure/largecrate/mule
-	icon_state = "mulecrate"

 /obj/structure/largecrate/lisa
 	icon_state = "lisacrate"
@@ -27,7 +27,7 @@
 	..()

 /obj/structure/curtain/proc/toggle()
-	opacity = !opacity
+	set_opacity(!opacity)
 	if(opacity)
 		icon_state = "closed"
 		layer = SHOWER_CLOSED_LAYER
@@ -191,7 +191,7 @@

 	Close()
 		..()
-		opacity = 0
+		set_opacity(0)

 /obj/structure/mineral_door/transparent/plasma
 	mineralType = "plasma"
@@ -228,7 +228,7 @@
 		flick("[mineralType]opening",src)
 		sleep(10)
 		density = 0
-		opacity = 0
+		set_opacity(0)
 		state = 1
 		update_icon()
 		isSwitchingStates = 0
@@ -239,7 +239,7 @@
 		flick("[mineralType]closing",src)
 		sleep(10)
 		density = 1
-		opacity = 1
+		set_opacity(1)
 		state = 0
 		update_icon()
 		isSwitchingStates = 0
@@ -265,7 +265,7 @@
 		flick("[mineralType]opening",src)
 		sleep(10)
 		density = 0
-		opacity = 0
+		set_opacity(0)
 		state = 1
 		update_icon()
 		isSwitchingStates = 0
@@ -280,7 +280,7 @@
 		flick("[mineralType]closing",src)
 		sleep(10)
 		density = 1
-		opacity = 1
+		set_opacity(1)
 		state = 0
 		update_icon()
 		isSwitchingStates = 0
@@ -138,10 +138,10 @@
 	return data

 /datum/song/Topic(href, href_list)
-	if(!in_range(instrumentObj, usr) || (issilicon(usr) && instrumentObj.loc != usr) || !isliving(usr) || !usr.canmove || usr.restrained())
+	if(!in_range(instrumentObj, usr) || (issilicon(usr) && instrumentObj.loc != usr) || !isliving(usr) || usr.incapacitated())
 		usr << browse(null, "window=instrument")
 		usr.unset_machine()
-		return
+		return 1

 	instrumentObj.add_fingerprint(usr)

@@ -168,6 +168,8 @@
 		//split into lines
 		spawn()
 			lines = splittext(t, "\n")
+			if(lines.len == 0)
+				return 1
 			if(copytext(lines[1],1,6) == "BPM: ")
 				tempo = sanitize_tempo(600 / text2num(copytext(lines[1],6)))
 				lines.Cut(1,2)
@@ -291,7 +293,7 @@
 	ui_interact(user)

 /obj/structure/piano/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	if(!user || !anchored)
+	if(!isliving(user) || user.incapacitated() || !anchored)
 		return

 	song.ui_interact(user, ui_key, ui, force_open)
@@ -55,11 +55,10 @@
 	//lighting check
 	var/light_amount = 0
 	var/turf/T = get_turf(src)
-	var/atom/movable/lighting_overlay/LO = locate(/atom/movable/lighting_overlay) in T
-	if(LO)
-		light_amount = LO.get_clamped_lum(0.5)*10
+	if(T)
+		light_amount = T.get_lumcount(0.5) * 10
 	else
-		light_amount =  10
+		light_amount = 10

 	if(light_amount > 2)
 		to_chat(M, "<span class='warning'>It's too bright here to use [src.name]!</span>")