Merge remote-tracking branch 'upstream/master' into stupid-triggers

code/game/objects/buckling.dm

@@ -12,6 +12,11 @@
 	. = ..()
 	if(can_buckle && buckled_mob)
 		return user_unbuckle_mob(user)
+		
+/atom/movable/attack_robot(mob/living/user)
+	. = ..()
+	if(can_buckle && buckled_mob && Adjacent(user)) // attack_robot is called on all ranges, so the Adjacent check is needed
+		return user_unbuckle_mob(user)
 
 /atom/movable/MouseDrop_T(mob/living/M, mob/living/user)
 	. = ..()

code/game/objects/effects/decals/Cleanable/tracks.dm

@@ -24,9 +24,9 @@ var/global/list/image/fluidtrack_cache=list()
 	var/crusty=0
 	var/image/overlay
 
-	New(_direction,_color,_wet)
+	New(_direction,item_color,_wet)
 		src.direction=_direction
-		src.basecolor=_color
+		src.basecolor=item_color
 		src.wet=_wet
 
 // Footprints, tire trails...

code/game/objects/effects/effect_system.dm

@@ -63,13 +63,6 @@ would spawn and follow the beaker, even if it is carried or thrown.
 		return
 	return
 
-/obj/effect/effect/water/Destroy()
-	//var/turf/T = src.loc
-	//if (istype(T, /turf))
-	//	T.firelevel = 0 //TODO: FIX
-	src.delete()
-	return ..()
-
 /obj/effect/effect/water/Move(turf/newloc)
 	//var/turf/T = src.loc
 	//if (istype(T, /turf))

code/game/objects/items.dm

@@ -37,7 +37,7 @@
 	var/list/materials = list()
 	//Since any item can now be a piece of clothing, this has to be put here so all items share it.
 	var/flags_inv //This flag is used to determine when items in someone's inventory cover others. IE helmets making it so you can't see glasses, etc.
-	var/_color = null
+	var/item_color = null
 	var/body_parts_covered = 0 //see setup.dm for appropriate bit flags
 	//var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible
 	var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets)

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

@@ -10,11 +10,13 @@
 	materials = list(MAT_METAL=10000, MAT_GLASS=2500)
 	var/code = 2
 
+	is_special = 1
+
 /obj/item/device/radio/electropack/attack_hand(mob/user as mob)
 	if(src == user.back)
 		user << "<span class='notice'>You need help taking this off!</span>"
-		return
-	..()
+		return 0
+	. = ..()
 
 /obj/item/device/radio/electropack/Destroy()
 	if(istype(src.loc, /obj/item/assembly/shock_kit))
@@ -53,42 +55,22 @@
 			A.flags |= NODROP
 
 /obj/item/device/radio/electropack/Topic(href, href_list)
-	//..()
-	if(usr.stat || usr.restrained())
-		return
-	if(((istype(usr, /mob/living/carbon/human) && ((!( ticker ) || (ticker && ticker.mode != "monkey")) && usr.contents.Find(src))) || (usr.contents.Find(master) || (in_range(src, usr) && istype(loc, /turf)))))
-		usr.set_machine(src)
-		if(href_list["freq"])
-			var/new_frequency = sanitize_frequency(frequency + text2num(href_list["freq"]))
-			set_frequency(new_frequency)
-		else
-			if(href_list["code"])
-				code += text2num(href_list["code"])
-				code = round(code)
-				code = min(100, code)
-				code = max(1, code)
-			else
-				if(href_list["power"])
-					on = !( on )
-					icon_state = "electropack[on]"
-		if(!( master ))
-			if(istype(loc, /mob))
-				attack_self(loc)
-			else
-				for(var/mob/M in viewers(1, src))
-					if(M.client)
-						attack_self(M)
-		else
-			if(istype(master.loc, /mob))
-				attack_self(master.loc)
-			else
-				for(var/mob/M in viewers(1, master))
-					if(M.client)
-						attack_self(M)
-	else
-		usr << browse(null, "window=radio")
-		return
-	return
+	if(..())
+		return 1
+
+	if(href_list["freq"])
+		var/new_frequency = sanitize_frequency(frequency + text2num(href_list["freq"]))
+		set_frequency(new_frequency)
+
+	else if(href_list["code"])
+		code += text2num(href_list["code"])
+		code = round(code)
+		code = Clamp(code, 1, 100)
+
+	else if(href_list["power"])
+		on = !on
+
+	add_fingerprint(usr)
 
 /obj/item/device/radio/electropack/receive_signal(datum/signal/signal)
 	if(!signal || signal.encryption != code)
@@ -115,26 +97,17 @@
 		master.receive_signal()
 	return
 
-/obj/item/device/radio/electropack/attack_self(mob/user as mob, flag1)
 
-	if(!istype(user, /mob/living/carbon/human))
-		return
-	user.set_machine(src)
-	var/dat = {"<TT>
-<A href='?src=\ref[src];power=1'>Turn [on ? "Off" : "On"]</A><BR>
-<B>Frequency/Code</B> for electropack:<BR>
-Frequency:
-<A href='byond://?src=\ref[src];freq=-10'>-</A>
-<A href='byond://?src=\ref[src];freq=-2'>-</A> [format_frequency(frequency)]
-<A href='byond://?src=\ref[src];freq=2'>+</A>
-<A href='byond://?src=\ref[src];freq=10'>+</A><BR>
+/obj/item/device/radio/electropack/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	var/data[0]
 
-Code:
-<A href='byond://?src=\ref[src];code=-5'>-</A>
-<A href='byond://?src=\ref[src];code=-1'>-</A> [code]
-<A href='byond://?src=\ref[src];code=1'>+</A>
-<A href='byond://?src=\ref[src];code=5'>+</A><BR>
-</TT>"}
-	user << browse(dat, "window=radio")
-	onclose(user, "radio")
-	return
+	data["power"] = on
+	data["freq"] = format_frequency(frequency)
+	data["code"] = code
+
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "radio_electro.tmpl", "[name]", 400, 500)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(1)

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

@@ -38,6 +38,9 @@ var/global/list/default_medbay_channels = list(
 	var/list/channels = list() //see communications.dm for full list. First channes is a "default" for :h
 	var/subspace_transmission = 0
 	var/syndie = 0//Holder to see if it's a syndicate encrpyed radio
+
+	var/is_special = 0 //For electropacks mostly, skips Topic() checks
+
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	throw_speed = 2
@@ -89,59 +92,68 @@ var/global/list/default_medbay_channels = list(
 		secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name],  RADIO_CHAT)
 
 /obj/item/device/radio/attack_ghost(mob/user)
-	interact(user)
+	return ui_interact(user)
 
 /obj/item/device/radio/attack_self(mob/user as mob)
 	user.set_machine(src)
 	interact(user)
 
-/obj/item/device/radio/interact(mob/user as mob)
-	if(!on)
-		return
+/obj/item/device/radio/interact(mob/user)
+	if(!user)
+		return 0
 
-	if(active_uplink_check(user))
-		return
+	if(b_stat)
+		wires.Interact(user)
 
-	var/dat = "<html><head><title>[src]</title></head><body><TT>"
+	return ui_interact(user)
 
-	if(!istype(src, /obj/item/device/radio/headset)) //Headsets dont get a mic button
-		dat += "Microphone: [broadcasting ? "<A href='byond://?src=\ref[src];talk=0'>Engaged</A>" : "<A href='byond://?src=\ref[src];talk=1'>Disengaged</A>"]<BR>"
+/obj/item/device/radio/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	var/data[0]
 
-	dat += {"
-				Speaker: [listening ? "<A href='byond://?src=\ref[src];listen=0'>Engaged</A>" : "<A href='byond://?src=\ref[src];listen=1'>Disengaged</A>"]<BR>
-				Frequency:
-				<A href='byond://?src=\ref[src];freq=-10'>-</A>
-				<A href='byond://?src=\ref[src];freq=-2'>-</A>
-				[format_frequency(frequency)]
-				<A href='byond://?src=\ref[src];freq=2'>+</A>
-				<A href='byond://?src=\ref[src];freq=10'>+</A><BR>
-				"}
+	data["mic_status"] = broadcasting
+	data["speaker"] = listening
+	data["freq"] = format_frequency(frequency)
+	data["rawfreq"] = num2text(frequency)
 
-	dat+=list_channels(user)
+	data["mic_cut"] = (wires.IsIndexCut(WIRE_TRANSMIT) || wires.IsIndexCut(WIRE_SIGNAL))
+	data["spk_cut"] = (wires.IsIndexCut(WIRE_RECEIVE) || wires.IsIndexCut(WIRE_SIGNAL))
 
-	dat+={"[text_wires()]</TT></body></html>"}
-	user << browse(dat, "window=radio")
-	onclose(user, "radio")
-	return
+	var/list/chanlist = list_channels(user)
+	if(islist(chanlist) && chanlist.len)
+		data["chan_list"] = chanlist
+		data["chan_list_len"] = chanlist.len
+
+	if(syndie)
+		data["useSyndMode"] = 1
+
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "radio_basic.tmpl", "[name]", 400, 550)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(1)
 
 
 /obj/item/device/radio/proc/list_channels(var/mob/user)
 	return list_internal_channels(user)
 
 /obj/item/device/radio/proc/list_secure_channels(var/mob/user)
-	var/dat = ""
-	for (var/ch_name in channels)
-		dat+=text_sec_channel(ch_name, channels[ch_name])
+	var/dat[0]
+
+	for(var/ch_name in channels)
+		var/chan_stat = channels[ch_name]
+		var/listening = !!(chan_stat & FREQ_LISTENING) != 0
+
+		dat.Add(list(list("chan" = ch_name, "display_name" = ch_name, "secure_channel" = 1, "sec_channel_listen" = !listening)))
+
 	return dat
 
 /obj/item/device/radio/proc/list_internal_channels(var/mob/user)
-	var/dat = ""
-	for (var/internal_chan in internal_channels)
+	var/dat[0]
+	for(var/internal_chan in internal_channels)
 		if(has_channel_access(user, internal_chan))
-			dat+="<A href='byond://?src=\ref[src];spec_freq=[internal_chan]'>[get_frequency_name(text2num(internal_chan))]</A><br>"
+			dat.Add(list(list("chan" = internal_chan, "display_name" = get_frequency_name(text2num(internal_chan)))))
 
-	if(dat)
-		dat = "<br><b>Internal Channels</b><br>" + dat
 	return dat
 
 /obj/item/device/radio/proc/has_channel_access(var/mob/user, var/freq)
@@ -169,13 +181,6 @@ var/global/list/default_medbay_channels = list(
 		return wires.GetInteractWindow()
 	return
 
-/obj/item/device/radio/proc/text_sec_channel(var/chan_name, var/chan_stat)
-	var/list = !!(chan_stat&FREQ_LISTENING)!=0
-	return {"
-			<B>[chan_name]</B><br>
-			Speaker: <A href='byond://?src=\ref[src];ch_name=[chan_name];listen=[!list]'>[list ? "Engaged" : "Disengaged"]</A><BR>
-			"}
-
 /obj/item/device/radio/proc/ToggleBroadcast()
 	broadcasting = !broadcasting && !(wires.IsIndexCut(WIRE_TRANSMIT) || wires.IsIndexCut(WIRE_SIGNAL))
 
@@ -186,6 +191,9 @@ var/global/list/default_medbay_channels = list(
 	if(..())
 		return 1
 
+	if(is_special)
+		return 0
+
 	if (href_list["track"])
 		var/mob/target = locate(href_list["track"])
 		var/mob/living/silicon/ai/A = locate(href_list["track2"])
@@ -205,7 +213,7 @@ var/global/list/default_medbay_channels = list(
 	else if (href_list["talk"])
 		ToggleBroadcast()
 		. = 1
-	else if (href_list["listen"])
+	else if(href_list["listen"])
 		var/chan_name = href_list["ch_name"]
 		if (!chan_name)
 			ToggleReception()
@@ -220,11 +228,10 @@ var/global/list/default_medbay_channels = list(
 		if(has_channel_access(usr, freq))
 			set_frequency(text2num(freq))
 		. = 1
+
 	if(href_list["nowindow"]) // here for pAIs, maybe others will want it, idk
 		return 1
 
-	if(.)
-		interact(usr)
 	add_fingerprint(usr)
 
 /obj/item/device/radio/proc/autosay(var/message, var/from, var/channel, var/zlevel = config.contact_levels) //BS12 EDIT
@@ -576,6 +583,11 @@ var/global/list/default_medbay_channels = list(
 	syndie = 1
 	keyslot = new /obj/item/device/encryptionkey/syndicate
 
+/obj/item/device/radio/borg/syndicate/CanUseTopic(mob/user, datum/topic_state/state)
+	. = ..()
+	if(. == STATUS_UPDATE && istype(user, /mob/living/silicon/robot/syndicate))
+		. = STATUS_INTERACTIVE
+
 /obj/item/device/radio/borg/Destroy()
 	myborg = null
 	return ..()
@@ -703,32 +715,40 @@ var/global/list/default_medbay_channels = list(
 				usr << "<span class='notice'>Loudspeaker enabled.</span>"
 		. = 1
 
-	if(.)
-		interact(usr)
 
 /obj/item/device/radio/borg/interact(mob/user as mob)
 	if(!on)
 		return
 
-	var/dat = "<html><head><title>[src]</title></head><body><TT>"
-	dat += {"
-				Speaker: [listening ? "<A href='byond://?src=\ref[src];listen=0'>Engaged</A>" : "<A href='byond://?src=\ref[src];listen=1'>Disengaged</A>"]<BR>
-				Frequency:
-				<A href='byond://?src=\ref[src];freq=-10'>-</A>
-				<A href='byond://?src=\ref[src];freq=-2'>-</A>
-				[format_frequency(frequency)]
-				<A href='byond://?src=\ref[src];freq=2'>+</A>
-				<A href='byond://?src=\ref[src];freq=10'>+</A><BR>
-				Broadcasting: [subspace_transmission ? "<A href='byond://?src=\ref[src];mode=0'>Disable</A>" : "<A href='byond://?src=\ref[src];mode=1'>Enable</A>"]<BR>
-				Loudspeaker: [shut_up ? "<A href='byond://?src=\ref[src];shutup=0'>Enable</A>" : "<A href='byond://?src=\ref[src];shutup=1'>Disable</A>"]<BR>
-				"}
+	. = ..()
 
-	if(subspace_transmission)//Don't even bother if subspace isn't turned on
-		dat+=list_channels(user)
-	dat+={"[text_wires()]</TT></body></html>"}
-	user << browse(dat, "window=radio")
-	onclose(user, "radio")
-	return
+/obj/item/device/radio/borg/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	var/data[0]
+
+	data["mic_status"] = broadcasting
+	data["speaker"] = listening
+	data["freq"] = format_frequency(frequency)
+	data["rawfreq"] = num2text(frequency)
+
+	var/list/chanlist = list_channels(user)
+	if(islist(chanlist) && chanlist.len)
+		data["chan_list"] = chanlist
+		data["chan_list_len"] = chanlist.len
+
+	if(syndie)
+		data["useSyndMode"] = 1
+
+	data["has_loudspeaker"] = 1
+	data["loudspeaker"] = !shut_up
+	data["has_subspace"] = 1
+	data["subspace"] = subspace_transmission
+
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "radio_basic.tmpl", "[name]", 430, 500)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(1)
 
 /obj/item/device/radio/proc/config(op)
 	if(radio_controller)

code/game/objects/items/random_items.dm

@@ -47,8 +47,7 @@
 	New()
 		..()
 		var/datum/reagent/R = pick(chemical_reagents_list)
-		var/global/list/rare_chems = list("minttoxin","nanites","xenomicrobes","adminordrazine")
-		if(rare_chems.Find(R))
+		if(rare_chemicals.Find(R))
 			reagents.add_reagent(R,10)
 		else
 			reagents.add_reagent(R,rand(2,3)*10)
@@ -61,11 +60,9 @@
 //	identify_probability = 0
 	New()
 		..()
-		var/global/list/chems_only = list("slimejelly","blood","water","lube","charcoal","toxin","cyanide","morphine","epinephrine","space_drugs","serotrotium","oxygen","copper","nitrogen","hydrogen","potassium","mercury","sulfur","carbon","chlorine","fluorine","sodium","phosphorus","lithium","sugar","sacid","facid","glycerol","radium","mutadone","thermite","mutagen","virusfood","iron","gold","silver","uranium","aluminum","silicon","fuel","cleaner","atrazine","plasma","teporone","lexorin","silver_sulfadiazine","salbutamol","perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide","pen_acid","mannitol","oculine","styptic_powder","methamphetamine","cryoxadone","spaceacillin","carpotoxin","lsd","fluorosurfactant","fluorosurfactant","ethanol","ammonia","diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin","frostoil","amanitin","psilocybin","enzyme","nothing","salglu_solution","antifreeze","neurotoxin")
-		var/global/list/rare_chems = list("minttoxin","nanites","xenomicrobes","adminordrazine")
 
-		var/datum/reagent/R = pick(chems_only + rare_chems)
-		if(rare_chems.Find(R))
+		var/datum/reagent/R = pick(standard_chemicals + rare_chemicals)
+		if(rare_chemicals.Find(R))
 			reagents.add_reagent(R,10)
 		else
 			reagents.add_reagent(R,rand(2,3)*10)
@@ -78,35 +75,35 @@
 //	identify_probability = 0
 	New()
 		..()
-		var/global/list/base_chems = list("water","oxygen","nitrogen","hydrogen","potassium","mercury","carbon","chlorine","fluorine","phosphorus","lithium","sulfur","sacid","radium","iron","aluminum","silicon","sugar","ethanol")
-		var/datum/reagent/R = pick(base_chems)
+		var/datum/reagent/R = pick(base_chemicals)
 		reagents.add_reagent(R,rand(2,6)*5)
 		name = "unlabelled bottle"
 		pixel_x = rand(-10,10)
 		pixel_y = rand(-10,10)
+		
 /obj/item/weapon/reagent_containers/food/drinks/bottle/random_drink
 	name = "unlabelled drink"
 	icon = 'icons/obj/drinks.dmi'
 	New()
 		..()
-		var/list/drinks_only = list("beer2","hot_coco","orangejuice","tomatojuice","limejuice","carrotjuice","berryjuice","poisonberryjuice","watermelonjuice","lemonjuice","banana","nothing","potato","milk","soymilk","cream","coffee","tea","icecoffee","icetea","cola","nuka_cola","spacemountainwind","thirteenloko","dr_gibb","space_up","lemon_lime","beer","whiskey","gin","rum","vodka","holywater","tequilla","vermouth","wine","tonic","kahlua","cognac","ale","sodawater","ice","bilk","atomicbomb","threemileisland","goldschlager","patron","gintonic","cubalibre","whiskeycola","martini","vodkamartini","whiterussian","screwdrivercocktail","booger","bloodymary","gargleblaster","bravebull","tequillasunrise","toxinsspecial","beepskysmash","salglu_solution","irishcream","manlydorf","longislandicedtea","moonshine","b52","irishcoffee","margarita","blackrussian","manhattan","manhattan_proj","whiskeysoda","antifreeze","barefoot","snowwhite","demonsblood","vodkatonic","ginfizz","bahama_mama","singulo","sbiten","devilskiss","red_mead","mead","iced_beer","grog","aloe","andalusia","alliescocktail","soy_latte","cafe_latte","acidspit","amasec","neurotoxin","hippiesdelight","bananahonk","silencer","changelingsting","irishcarbomb","syndicatebomb","erikasurprise","driestmartini")
+		var/list/additional_drinks = list()
 		if(prob(50))
-			drinks_only += list("pancuronium","adminordrazine","lsd","omnizine","blood")
+			additional_drinks += list("pancuronium","adminordrazine","lsd","omnizine","blood")
 
-		var/datum/reagent/R = pick(drinks_only)
+		var/datum/reagent/R = pick(drinks + additional_drinks)
 		reagents.add_reagent(R,volume)
 		name = "unlabelled bottle"
 		icon_state = pick("alco-white","alco-green","alco-blue","alco-clear","alco-red")
 		pixel_x = rand(-5,5)
 		pixel_y = rand(-5,5)
+		
 /obj/item/weapon/reagent_containers/food/drinks/bottle/random_reagent // Same as the chembottle code except the container
 	name = "unlabelled drink?"
 	icon = 'icons/obj/drinks.dmi'
 	New()
 		..()
 		var/datum/reagent/R = pick(chemical_reagents_list)
-		var/global/list/rare_chems = list("minttoxin","nanites","xenomicrobes","adminordrazine")
-		if(rare_chems.Find(R))
+		if(rare_chemicals.Find(R))
 			reagents.add_reagent(R,10)
 		else
 			reagents.add_reagent(R,rand(3,10)*10)
@@ -123,20 +120,17 @@
 
 	New()
 		..()
-		var/global/list/meds_only = list("charcoal","toxin","cyanide","morphine","epinephrine","space_drugs","serotrotium","mutadone","mutagen","teporone","lexorin","silver_sulfadiazine","salbutamol","perfluorodecalin","omnizine","synaptizine","haloperidol","potass_iodide","pen_acid","mannitol","oculine","styptic_powder","methamphetamine","spaceacillin","carpotoxin","lsd","ethanol","ammonia","diethylamine","antihol","pancuronium","lipolicide","condensedcapsaicin","frostoil","amanitin","psilocybin","nothing","salglu_solution","neurotoxin")
-		var/global/list/rare_meds = list("nanites","xenomicrobes","minttoxin","adminordrazine","blood")
-
 		var/i = 1
 		while(i < storage_slots)
 
 			var/datum/reagent/R
 			if(prob(50))
-				R = pick(meds_only + rare_meds)
+				R = pick(standard_medicines + rare_medicines)
 			else
-				R = pick(meds_only)
+				R = pick(standard_medicines)
 			var/obj/item/weapon/reagent_containers/pill/P = new(src)
 
-			if(rare_meds.Find(R))
+			if(rare_medicines.Find(R))
 				P.reagents.add_reagent(R,10)
 			else
 				P.reagents.add_reagent(R,rand(2,5)*10)
@@ -185,8 +179,7 @@
 	New()
 		..()
 		sleep(2)
-		var/global/list/base_chems = list("water","oxygen","nitrogen","hydrogen","potassium","mercury","carbon","chlorine","fluorine","phosphorus","lithium","sulfur","sacid","radium","iron","aluminum","silicon","sugar","ethanol")
-		for(var/chem in base_chems)
+		for(var/chem in standard_chemicals)
 			var/obj/item/weapon/reagent_containers/glass/bottle/B = new(src)
 			B.reagents.add_reagent(chem,B.volume)
 			if(prob(85))

code/game/objects/items/weapons/implants/implant.dm

@@ -8,7 +8,7 @@
 	var/implanted = null
 	var/mob/living/imp_in = null
 	var/obj/item/organ/external/part = null
-	_color = "b"
+	item_color = "b"
 	var/allow_reagents = 0
 	var/malfunction = 0
 

code/game/objects/items/weapons/implants/implantcase.dm

@@ -22,7 +22,7 @@
 
 	update()
 		if (src.imp)
-			src.icon_state = text("implantcase-[]", src.imp._color)
+			src.icon_state = text("implantcase-[]", src.imp.item_color)
 			src.origin_tech = src.imp.origin_tech
 		else
 			src.icon_state = "implantcase-0"

code/game/objects/items/weapons/implants/implantfreedom.dm

@@ -3,7 +3,7 @@
 /obj/item/weapon/implant/freedom
 	name = "freedom"
 	desc = "Use this to escape from those evil Red Shirts."
-	_color = "r"
+	item_color = "r"
 	var/activation_emote = "chuckle"
 	origin_tech = "materials=2;magnets=3;biotech=3;syndicate=4"
 	var/uses = 4

code/game/objects/items/weapons/melee/energy.dm

@@ -25,10 +25,10 @@
 		hitsound = 'sound/weapons/blade1.ogg'
 		if(attack_verb_on.len)
 			attack_verb = attack_verb_on
-		if(!_color)
+		if(!item_color)
 			icon_state = icon_state_on
 		else
-			icon_state = "sword[_color]"
+			icon_state = "sword[item_color]"
 		w_class = w_class_on
 		playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness
 		user << "<span class='notice'>[src] is now active.</span>"
@@ -86,8 +86,8 @@
 	var/blade_color
 	
 /obj/item/weapon/melee/energy/sword/New()
-	if(_color == null)
-		_color = pick("red", "blue", "green", "purple")
+	if(item_color == null)
+		item_color = pick("red", "blue", "green", "purple")
 
 /obj/item/weapon/melee/energy/sword/IsShield()
 	if(active)
@@ -120,12 +120,12 @@
 	icon_state = "esaw_0"
 	icon_state_on = "esaw_1"
 	hitcost = 75 //Costs more than a standard cyborg esword
-	_color = null
+	item_color = null
 	w_class = 3
 
 /obj/item/weapon/melee/energy/sword/cyborg/saw/New()
 	..()
-	_color = null
+	item_color = null
 
 /obj/item/weapon/melee/energy/sword/cyborg/saw/IsShield()
 	return 0
@@ -133,16 +133,16 @@
 /obj/item/weapon/melee/energy/sword/saber
 
 /obj/item/weapon/melee/energy/sword/saber/blue
-	_color = "blue"
+	item_color = "blue"
 
 /obj/item/weapon/melee/energy/sword/saber/purple
-	_color = "purple"
+	item_color = "purple"
 
 /obj/item/weapon/melee/energy/sword/saber/green
-	_color = "green"
+	item_color = "green"
 
 /obj/item/weapon/melee/energy/sword/saber/red
-	_color = "red"
+	item_color = "red"
 
 /obj/item/weapon/melee/energy/sword/saber/attackby(obj/item/weapon/W, mob/living/user, params)
 	..()
@@ -156,7 +156,7 @@
 			var/obj/item/weapon/twohanded/dualsaber/newSaber = new /obj/item/weapon/twohanded/dualsaber(user.loc)
 			if(src.hacked) // That's right, we'll only check the "original" esword.
 				newSaber.hacked = 1
-				newSaber._color = "rainbow"
+				newSaber.item_color = "rainbow"
 			user.unEquip(W)
 			user.unEquip(src)
 			qdel(W)
@@ -165,7 +165,7 @@
 	else if(istype(W, /obj/item/device/multitool))
 		if(hacked == 0)
 			hacked = 1
-			_color = "rainbow"
+			item_color = "rainbow"
 			user << "<span class='warning'>RNBW_ENGAGE</span>"
 
 			if(active)

code/game/objects/structures/bedsheet_bin.dm

@@ -15,7 +15,7 @@ LINEN BINS
 	throw_speed = 1
 	throw_range = 2
 	w_class = 1.0
-	_color = "white"
+	item_color = "white"
 	slot_flags = SLOT_BACK
 
 
@@ -31,127 +31,127 @@ LINEN BINS
 
 /obj/item/weapon/bedsheet/blue
 	icon_state = "sheetblue"
-	_color = "blue"
+	item_color = "blue"
 
 /obj/item/weapon/bedsheet/green
 	icon_state = "sheetgreen"
-	_color = "green"
+	item_color = "green"
 
 /obj/item/weapon/bedsheet/orange
 	icon_state = "sheetorange"
-	_color = "orange"
+	item_color = "orange"
 
 /obj/item/weapon/bedsheet/purple
 	icon_state = "sheetpurple"
-	_color = "purple"
+	item_color = "purple"
 
 /obj/item/weapon/bedsheet/patriot
 	name = "patriotic bedsheet"
 	desc = "You've never felt more free than when sleeping on this."
 	icon_state = "sheetUSA"
-	_color = "sheetUSA"
+	item_color = "sheetUSA"
 
 /obj/item/weapon/bedsheet/rainbow
 	name = "rainbow bedsheet"
 	desc = "A multi_colored blanket.  It's actually several different sheets cut up and sewn together."
 	icon_state = "sheetrainbow"
-	_color = "rainbow"
+	item_color = "rainbow"
 
 /obj/item/weapon/bedsheet/red
 	icon_state = "sheetred"
-	_color = "red"
+	item_color = "red"
 
 /obj/item/weapon/bedsheet/yellow
 	icon_state = "sheetyellow"
-	_color = "yellow"
+	item_color = "yellow"
 
 /obj/item/weapon/bedsheet/mime
 	name = "mime's blanket"
 	desc = "A very soothing striped blanket.  All the noise just seems to fade out when you're under the covers in this."
 	icon_state = "sheetmime"
-	_color = "mime"
+	item_color = "mime"
 
 /obj/item/weapon/bedsheet/clown
 	name = "clown's blanket"
 	desc = "A rainbow blanket with a clown mask woven in.  It smells faintly of bananas."
 	icon_state = "sheetclown"
-	_color = "clown"
+	item_color = "clown"
 
 /obj/item/weapon/bedsheet/captain
 	name = "captain's bedsheet."
 	desc = "It has a Nanotrasen symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern captains."
 	icon_state = "sheetcaptain"
-	_color = "captain"
+	item_color = "captain"
 
 /obj/item/weapon/bedsheet/rd
 	name = "research director's bedsheet"
 	desc = "It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day."
 	icon_state = "sheetrd"
-	_color = "director"
+	item_color = "director"
 
 /obj/item/weapon/bedsheet/medical
 	name = "medical blanket"
 	desc = "It's a sterilized* blanket commonly used in the Medbay.  *Sterilization is voided if a virologist is present onboard the station."
 	icon_state = "sheetmedical"
-	_color = "medical"
+	item_color = "medical"
 
 /obj/item/weapon/bedsheet/cmo
 	name = "chief medical officer's bedsheet"
 	desc = "It's a sterilized blanket that has a cross emblem.  There's some cat fur on it, likely from Runtime."
 	icon_state = "sheetcmo"
-	_color = "cmo"
+	item_color = "cmo"
 
 /obj/item/weapon/bedsheet/hos
 	name = "head of security's bedsheet"
 	desc = "It is decorated with a shield emblem.  While crime doesn't sleep, you do, but you are still THE LAW!"
 	icon_state = "sheethos"
-	_color = "hosred"
+	item_color = "hosred"
 
 /obj/item/weapon/bedsheet/hop
 	name = "head of personnel's bedsheet"
 	desc = "It is decorated with a key emblem.  For those rare moments when you can rest and cuddle with Ian without someone screaming for you over the radio."
 	icon_state = "sheethop"
-	_color = "hop"
+	item_color = "hop"
 
 /obj/item/weapon/bedsheet/ce
 	name = "chief engineer's bedsheet"
 	desc = "It is decorated with a wrench emblem.  It's highly reflective and stain resistant, so you don't need to worry about ruining it with oil."
 	icon_state = "sheetce"
-	_color = "chief"
+	item_color = "chief"
 
 /obj/item/weapon/bedsheet/qm
 	name = "quartermaster's bedsheet"
 	desc = "It is decorated with a crate emblem in silver lining.  It's rather tough, and just the thing to lie on after a hard day of pushing paper."
 	icon_state = "sheetqm"
-	_color = "qm"
+	item_color = "qm"
 
 /obj/item/weapon/bedsheet/brown
 	icon_state = "sheetbrown"
-	_color = "cargo"
+	item_color = "cargo"
 
 /obj/item/weapon/bedsheet/centcom
 	name = "centcom bedsheet"
 	desc = "Woven with advanced nanothread for warmth as well as being very decorated, essential for all officials."
 	icon_state = "sheetcentcom"
-	_color = "centcom"
+	item_color = "centcom"
 
 /obj/item/weapon/bedsheet/syndie
 	name = "syndicate bedsheet"
 	desc = "It has a syndicate emblem and it has an aura of evil."
 	icon_state = "sheetsyndie"
-	_color = "syndie"
+	item_color = "syndie"
 
 /obj/item/weapon/bedsheet/cult
 	name = "cultist's bedsheet"
 	desc = "You might dream of Nar'Sie if you sleep with this.  It seems rather tattered and glows of an eldritch presence."
 	icon_state = "sheetcult"
-	_color = "cult"
+	item_color = "cult"
 
 /obj/item/weapon/bedsheet/wiz
 	name = "wizard's bedsheet"
 	desc = "A special fabric enchanted with magic so you can have an enchanted night.  It even glows!"
 	icon_state = "sheetwiz"
-	_color = "wiz"
+	item_color = "wiz"
 
 
 

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

@@ -30,6 +30,11 @@
 	if(buckled_mob)
 		if(buckled_mob.incapacitated())
 			return 0
+			
+		var/mob/living/thedriver = user
+		var/mob_delay = thedriver.movement_delay()
+		if(mob_delay > 0)
+			move_delay += mob_delay
 
 		if(ishuman(buckled_mob))
 			var/mob/living/carbon/human/driver = user