Merge remote-tracking branch 'citadel/master' into michael_labs

code/game/machinery/Beacon.dm

@@ -25,10 +25,10 @@
 // update the invisibility and icon
 /obj/machinery/bluespace_beacon/hide(intact)
 	invisibility = intact ? INVISIBILITY_MAXIMUM : 0
-	updateicon()
+	update_icon()
 
 // update the icon_state
-/obj/machinery/bluespace_beacon/proc/updateicon()
+/obj/machinery/bluespace_beacon/update_icon()
 	var/state="floor_beacon"
 
 	if(invisibility)
@@ -45,4 +45,4 @@
 	else if (Beacon.loc != loc)
 		Beacon.forceMove(loc)
 
-	updateicon()
+	update_icon()

code/game/machinery/_machinery.dm

@@ -181,8 +181,9 @@ Class Procs:
 		if(isliving(A))
 			var/mob/living/L = A
 			L.update_canmove()
-	SEND_SIGNAL(src, COMSIG_MACHINE_EJECT_OCCUPANT, occupant)
-	occupant = null
+	if(occupant)
+		SEND_SIGNAL(src, COMSIG_MACHINE_EJECT_OCCUPANT, occupant)
+		occupant = null
 
 /obj/machinery/proc/can_be_occupant(atom/movable/am)
 	return occupant_typecache ? is_type_in_typecache(am, occupant_typecache) : isliving(am)

code/game/machinery/bloodbankgen.dm

@@ -12,7 +12,6 @@
 	var/filling = FALSE
 	var/obj/item/reagent_containers/blood/bag = null
 	var/obj/item/reagent_containers/blood/outbag = null
-	var/bloodstored = 0
 	var/maxbloodstored = 1000
 	var/menustat = "menu"
 	var/efficiency = 0
@@ -20,7 +19,7 @@
 
 /obj/machinery/bloodbankgen/Initialize()
 	. = ..()
-	create_reagents(1000)
+	create_reagents(maxbloodstored, AMOUNT_VISIBLE)
 	update_icon()
 
 /obj/machinery/bloodbankgen/Destroy()
@@ -28,6 +27,14 @@
 	QDEL_NULL(outbag)
 	return ..()
 
+/obj/machinery/bloodbankgen/examine(mob/user)
+	. = ..()
+	if(bag)
+		. += "<span class='notice'>It has \a [bag.name] hooked to its <b>input</b> slot. The counter reads: \"Current Capacity: [bag.reagents.total_volume] of [bag.reagents.maximum_volume]\"</span>"
+	if(outbag)
+		. += "<span class='notice'>It has \a [bag.name] hooked to its <b>output</b> slot. The counter reads: \"Current Capacity: [outbag.reagents.total_volume] of [outbag.reagents.maximum_volume]\"</span>"
+
+
 /obj/machinery/bloodbankgen/handle_atom_del(atom/A)
 	..()
 	if(A == bag)
@@ -108,74 +115,42 @@
 
 /obj/machinery/bloodbankgen/process()
 	if(!is_operational())
-		return PROCESS_KILL
-
-	bloodstored = reagents.total_volume
+		return
 
 	var/transfer_amount = 20
 
 	if(draining)
-		if(reagents.total_volume >= reagents.maximum_volume)
-			draining = FALSE
+		if(reagents.total_volume >= reagents.maximum_volume || !bag || !bag.reagents.total_volume)
+			beep_stop_pumping()
 			return
-
-		if(bag)
-			if(bag.reagents.total_volume)
-				var/datum/reagent/blood/B = bag.reagents.has_reagent("blood")
-				if(B)
-					var/amount = reagents.maximum_volume - reagents.total_volume //monitor the machine's internal storage
-					amount = min(amount, transfer_amount)
-					if(!amount)
-						draining = FALSE
-						updateUsrDialog()
-						visible_message("[src] beeps loudly.")
-						playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
-						return
-
-					if(bag.blood_type == "SY") //no infinite loops using synthetics.
-						reagents.add_reagent("syntheticblood", amount)
-					else
-						reagents.add_reagent("syntheticblood", (amount+(5*efficiency)))
-
-					if(bag.reagents.total_volume >= amount)
-						bag.reagents.remove_reagent("blood", amount)
-					else
-						visible_message("[src] beeps loudly.")
-						playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
-						draining = FALSE
-
-					bag.update_icon()
-					update_icon()
-					updateUsrDialog()
-		else
-			draining = FALSE
-			updateUsrDialog()
+		var/blood_amount = bag.reagents.get_reagent_amount("blood")
+		//monitor the machine and blood bag's reagents storage.
+		var/amount = min(blood_amount, min(transfer_amount, reagents.maximum_volume - reagents.total_volume))
+		if(!amount)
+			beep_stop_pumping()
 			return
+		var/bonus = bag.blood_type == "SY" ? 0 : 5 * efficiency //no infinite loops using synthetics.
+		reagents.add_reagent("syntheticblood", amount + bonus)
+		bag.reagents.remove_reagent("blood", amount)
+		update_icon()
 
 	if(filling)
-		if(!reagents || !reagents.total_volume)
-			filling = FALSE //there ain't anything in the machine yo.
+		if(!reagents.total_volume || !outbag || outbag.reagents.total_volume >= outbag.reagents.maximum_volume)
+			beep_stop_pumping("[src] pings.", TRUE)
 			return
-		if(outbag && outbag.reagents.total_volume < outbag.reagents.maximum_volume)
-			var/amount = outbag.reagents.maximum_volume - outbag.reagents.total_volume //monitor the output bag's internal storage
-			amount = min(amount, transfer_amount)
-			if(!amount)
-				filling = FALSE
-				visible_message("[src] pings.")
-				playsound(loc, 'sound/machines/beep.ogg', 50, 1)
-				updateUsrDialog()
-				return
+		//monitor the output bag's  reagents storage.
+		var/amount = min(transfer_amount, outbag.reagents.maximum_volume - outbag.reagents.total_volume)
+		reagents.trans_to(outbag, amount)
+		update_icon()
 
-			reagents.trans_to(outbag, amount)
-			outbag.update_icon()
-			update_icon()
-			updateUsrDialog()
-		else
-			visible_message("[src] pings.")
-			playsound(loc, 'sound/machines/beep.ogg', 50, 1)
-			filling = FALSE
-			updateUsrDialog()
-			return
+/obj/machinery/bloodbankgen/proc/beep_stop_pumping(msg = "[src] beeps loudly.", out_instead_of_in = FALSE)
+	if(out_instead_of_in)
+		filling = FALSE
+	else
+		draining = FALSE
+	updateUsrDialog()
+	audible_message(msg)
+	playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
 
 /obj/machinery/bloodbankgen/attackby(obj/item/O, mob/user, params)
 	if(user.a_intent == INTENT_HARM)
@@ -198,8 +173,8 @@
 
 	if(istype(O, /obj/item/reagent_containers/blood))
 		. = TRUE //no afterattack
-		var/msg = ""
-		if(!panel_open)
+		var/msg
+		if(panel_open)
 			. += "Close the maintenance panel"
 		if(!anchored)
 			. += "[msg ? " and a" : "A"]nchor its bolts"
@@ -267,7 +242,7 @@
 	if(!bag && !outbag)
 		dat += "<div class='statusDisplay'>No containers inside, please insert container.</div>"
 
-	var/datum/browser/popup = new(user, "bloodbankgen", name, 350, 520)
+	var/datum/browser/popup = new(user, "bloodbankgen", name, 350, 420)
 	popup.set_content(dat)
 	popup.open()
 
@@ -305,6 +280,7 @@
 		if(usr && Adjacent(usr) && !issiliconoradminghost(usr))
 			usr.put_in_hands(bag)
 		bag = null
+		draining = null
 		update_icon()
 
 /obj/machinery/bloodbankgen/proc/detachoutput()
@@ -313,6 +289,7 @@
 		if(usr && Adjacent(usr) && !issiliconoradminghost(usr))
 			usr.put_in_hands(outbag)
 		outbag = null
+		filling = null
 		update_icon()
 
 /obj/machinery/bloodbankgen/proc/attachinput(obj/item/O, mob/user)
@@ -338,23 +315,22 @@
 		to_chat(user, "<span class='notice'>There is already something in this slot!</span>")
 
 /obj/machinery/bloodbankgen/Topic(href, href_list)
-	if(..() || panel_open)
+	. = ..()
+	if(. | !is_operational())
 		return
 
 	usr.set_machine(src)
 
 	if(href_list["activateinput"])
 		activateinput()
-		updateUsrDialog()
 
 	else if(href_list["detachinput"])
 		detachinput()
-		updateUsrDialog()
 
 	else if(href_list["activateoutput"])
 		activateoutput()
-		updateUsrDialog()
 
 	else if(href_list["detachoutput"])
 		detachoutput()
-		updateUsrDialog()
+
+	updateUsrDialog()

code/game/machinery/buttons.dm

@@ -38,21 +38,22 @@
 			board.one_access = 1
 			board.accesses = req_one_access
 
-
-/obj/machinery/button/update_icon()
-	cut_overlays()
+/obj/machinery/button/update_icon_state()
 	if(panel_open)
 		icon_state = "button-open"
-		if(device)
-			add_overlay("button-device")
-		if(board)
-			add_overlay("button-board")
-
+	else if(stat & (NOPOWER|BROKEN))
+		icon_state = "[skin]-p"
 	else
-		if(stat & (NOPOWER|BROKEN))
-			icon_state = "[skin]-p"
-		else
-			icon_state = skin
+		icon_state = skin
+
+/obj/machinery/button/update_overlays()
+	. = ..()
+	if(!panel_open)
+		return
+	if(device)
+		. += "button-device"
+	if(board)
+		. += "button-board"
 
 /obj/machinery/button/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/screwdriver))
@@ -168,7 +169,7 @@
 	if(device)
 		device.pulsed()
 
-	addtimer(CALLBACK(src, .proc/update_icon), 15)
+	addtimer(CALLBACK(src, /atom/.proc/update_icon), 15)
 
 /obj/machinery/button/power_change()
 	..()

code/game/machinery/camera/camera.dm

@@ -292,7 +292,7 @@
 			new /obj/item/stack/cable_coil(loc, 2)
 	qdel(src)
 
-/obj/machinery/camera/update_icon()
+/obj/machinery/camera/update_icon_state()
 	if(!status)
 		icon_state = "[initial(icon_state)]1"
 	else if (stat & EMPED)

code/game/machinery/cell_charger.dm

@@ -13,7 +13,7 @@
 	var/chargelevel = -1
 	var/charge_rate = 500
 
-/obj/machinery/cell_charger/proc/updateicon()
+/obj/machinery/cell_charger/update_icon()
 	cut_overlays()
 	if(charging)
 		add_overlay(image(charging.icon, charging.icon_state))
@@ -53,7 +53,7 @@
 			charging = W
 			user.visible_message("[user] inserts a cell into [src].", "<span class='notice'>You insert a cell into [src].</span>")
 			chargelevel = -1
-			updateicon()
+			update_icon()
 	else
 		if(!charging && default_deconstruction_screwdriver(user, icon_state, icon_state, W))
 			return
@@ -76,7 +76,7 @@
 	charging.update_icon()
 	charging = null
 	chargelevel = -1
-	updateicon()
+	update_icon()
 
 /obj/machinery/cell_charger/attack_hand(mob/user)
 	. = ..()
@@ -127,4 +127,4 @@
 	use_power(charge_rate)
 	charging.give(charge_rate)	//this is 2558, efficient batteries exist
 
-	updateicon()
+	update_icon()

code/game/machinery/computer/arcade.dm

@@ -67,7 +67,9 @@
 		/obj/item/clothing/shoes/kindleKicks = ARCADE_WEIGHT_RARE,
 		/obj/item/storage/belt/military/snack = ARCADE_WEIGHT_RARE,
 
-		/obj/item/clothing/mask/fakemoustache/italian = ARCADE_WEIGHT_RARE
+		/obj/item/clothing/mask/fakemoustache/italian = ARCADE_WEIGHT_RARE,
+		/obj/item/clothing/suit/hooded/wintercoat/ratvar/fake = ARCADE_WEIGHT_TRICK,
+		/obj/item/clothing/suit/hooded/wintercoat/narsie/fake = ARCADE_WEIGHT_TRICK
 	)
 
 	light_color = LIGHT_COLOR_GREEN

code/game/machinery/computer/communications.dm

@@ -70,7 +70,7 @@
 				if(check_access(I))
 					authenticated = 1
 					auth_id = "[I.registered_name] ([I.assignment])"
-					if((20 in I.access))
+					if((ACCESS_CAPTAIN in I.access))
 						authenticated = 2
 					playsound(src, 'sound/machines/terminal_on.ogg', 50, 0)
 				if(obj_flags & EMAGGED)
@@ -279,7 +279,7 @@
 
 		// OMG CENTCOM LETTERHEAD
 		if("MessageCentCom")
-			if(authenticated==2)
+			if(authenticated)
 				if(!checkCCcooldown())
 					to_chat(usr, "<span class='warning'>Arrays recycling.  Please stand by.</span>")
 					return

code/game/machinery/defibrillator_mount.dm

@@ -38,17 +38,21 @@
 		defib.cell.give(180) //90% efficiency, slightly better than the cell charger's 87.5%
 		update_icon()
 
-/obj/machinery/defibrillator_mount/update_icon()
-	cut_overlays()
-	if(defib)
-		add_overlay("defib")
-		if(defib.powered)
-			add_overlay(defib.safety ? "online" : "emagged")
-			var/ratio = defib.cell.charge / defib.cell.maxcharge
-			ratio = CEILING(ratio * 4, 1) * 25
-			add_overlay("charge[ratio]")
-		if(clamps_locked)
-			add_overlay("clamps")
+/obj/machinery/defibrillator_mount/update_overlays()
+	. = ..()
+	if(!defib)
+		return
+
+	. += "defib"
+
+	if(defib.powered)
+		. += (defib.safety ? "online" : "emagged")
+		var/ratio = defib.cell.charge / defib.cell.maxcharge
+		ratio = CEILING(ratio * 4, 1) * 25
+		. += "charge[ratio]"
+
+	if(clamps_locked)
+		. += "clamps"
 
 /obj/machinery/defibrillator_mount/get_cell()
 	if(defib)

code/game/machinery/firealarm.dm

@@ -58,8 +58,6 @@
 /obj/machinery/firealarm/update_icon()
 	cut_overlays()
 	SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
-	var/area/A = src.loc
-	A = A.loc
 
 	if(panel_open)
 		icon_state = "fire_b[buildstage]"
@@ -69,23 +67,32 @@
 		icon_state = "firex"
 		return
 
+	icon_state = "fire0"
+
 	if(stat & NOPOWER)
-		icon_state = "fire0"
 		return
 
-	if(is_station_level(z))
-		add_overlay("overlay_[GLOB.security_level]")
-		SSvis_overlays.add_vis_overlay(src, icon, "overlay_[GLOB.security_level]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
-	else
-		add_overlay("overlay_[SEC_LEVEL_GREEN]")
-		SSvis_overlays.add_vis_overlay(src, icon, "overlay_[SEC_LEVEL_GREEN]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
+	add_overlay("fire_overlay")
 
-	if(detecting)
-		add_overlay("overlay_[A.fire ? "fire" : "clear"]")
-		SSvis_overlays.add_vis_overlay(src, icon, "overlay_[A.fire ? "fire" : "clear"]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
+	if(is_station_level(z))
+		add_overlay("fire_[GLOB.security_level]")
+		SSvis_overlays.add_vis_overlay(src, icon, "fire_[GLOB.security_level]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
 	else
-		add_overlay("overlay_fire")
-		SSvis_overlays.add_vis_overlay(src, icon, "overlay_fire", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
+		add_overlay("fire_[SEC_LEVEL_GREEN]")
+		SSvis_overlays.add_vis_overlay(src, icon, "fire_[SEC_LEVEL_GREEN]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
+
+	var/area/A = src.loc
+	A = A.loc
+
+	if(!detecting || !A.fire)
+		add_overlay("fire_off")
+		SSvis_overlays.add_vis_overlay(src, icon, "fire_off", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
+	else if(obj_flags & EMAGGED)
+		add_overlay("fire_emagged")
+		SSvis_overlays.add_vis_overlay(src, icon, "fire_emagged", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
+	else
+		add_overlay("fire_on")
+		SSvis_overlays.add_vis_overlay(src, icon, "fire_on", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir)
 
 /obj/machinery/firealarm/emp_act(severity)
 	. = ..()
@@ -101,6 +108,7 @@
 	if(obj_flags & EMAGGED)
 		return
 	obj_flags |= EMAGGED
+	update_icon()
 	if(user)
 		user.visible_message("<span class='warning'>Sparks fly out of [src]!</span>",
 							"<span class='notice'>You emag [src], disabling its thermal sensors.</span>")
@@ -112,51 +120,39 @@
 		alarm()
 	..()
 
-/obj/machinery/firealarm/proc/alarm()
-	if(!is_operational() && (last_alarm+FIREALARM_COOLDOWN < world.time))
+/obj/machinery/firealarm/proc/alarm(mob/user)
+	if(!is_operational() || (last_alarm+FIREALARM_COOLDOWN > world.time))
 		return
 	last_alarm = world.time
 	var/area/A = get_area(src)
 	A.firealert(src)
-	playsound(src.loc, 'goon/sound/machinery/FireAlarm.ogg', 75)
+	playsound(loc, 'goon/sound/machinery/FireAlarm.ogg', 75)
+	if(user)
+		log_game("[user] triggered a fire alarm at [COORD(src)]")
 
-/obj/machinery/firealarm/proc/reset()
+/obj/machinery/firealarm/proc/reset(mob/user)
 	if(!is_operational())
 		return
 	var/area/A = get_area(src)
 	A.firereset(src)
+	if(user)
+		log_game("[user] reset a fire alarm at [COORD(src)]")
 
-/obj/machinery/firealarm/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
-									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "firealarm", name, 300, 150, master_ui, state)
-		ui.open()
-
-/obj/machinery/firealarm/ui_data(mob/user)
-	var/list/data = list()
-	data["emagged"] = obj_flags & EMAGGED ? 1 : 0
-
-	if(is_station_level(z))
-		data["seclevel"] = get_security_level()
-	else
-		data["seclevel"] = "green"
-
+/obj/machinery/firealarm/attack_hand(mob/user)
+	if(buildstage != 2)
+		return ..()
+	add_fingerprint(user)
 	var/area/A = get_area(src)
-	data["alarm"] = A.fire
+	if(A.fire)
+		reset(user)
+	else
+		alarm(user)
 
-	return data
+/obj/machinery/firealarm/attack_ai(mob/user)
+	return attack_hand(user)
 
-/obj/machinery/firealarm/ui_act(action, params)
-	if(..() || buildstage != 2)
-		return
-	switch(action)
-		if("reset")
-			reset()
-			. = TRUE
-		if("alarm")
-			alarm()
-			. = TRUE
+/obj/machinery/firealarm/attack_robot(mob/user)
+	return attack_hand(user)
 
 /obj/machinery/firealarm/attackby(obj/item/W, mob/user, params)
 	add_fingerprint(user)
@@ -200,6 +196,12 @@
 					to_chat(user, "<span class='notice'>You cut the wires from \the [src].</span>")
 					update_icon()
 					return
+				else if(W.force) //hit and turn it on
+					..()
+					var/area/A = get_area(src)
+					if(!A.fire)
+						alarm()
+					return
 			if(1)
 				if(istype(W, /obj/item/stack/cable_coil))
 					var/obj/item/stack/cable_coil/coil = W
@@ -322,8 +324,3 @@
 	if (!party_overlay)
 		party_overlay = iconstate2appearance('icons/turf/areas.dmi', "party")
 	A.add_overlay(party_overlay)
-
-/obj/machinery/firealarm/partyalarm/ui_data(mob/user)
-	. = ..()
-	var/area/A = get_area(src)
-	.["alarm"] = A && A.party

code/game/machinery/lightswitch.dm

@@ -21,9 +21,9 @@
 		name = "light switch ([area.name])"
 
 	on = area.lightswitch
-	updateicon()
+	update_icon()
 
-/obj/machinery/light_switch/proc/updateicon()
+/obj/machinery/light_switch/update_icon()
 	if(stat & NOPOWER)
 		icon_state = "light-p"
 	else
@@ -41,11 +41,11 @@
 	on = !on
 
 	area.lightswitch = on
-	area.updateicon()
+	area.update_icon()
 
 	for(var/obj/machinery/light_switch/L in area)
 		L.on = on
-		L.updateicon()
+		L.update_icon()
 
 	area.power_change()
 
@@ -57,7 +57,7 @@
 		else
 			stat |= NOPOWER
 
-		updateicon()
+		update_icon()
 
 /obj/machinery/light_switch/emp_act(severity)
 	. = ..()

code/game/machinery/magnet.dm

@@ -46,10 +46,10 @@
 // update the invisibility and icon
 /obj/machinery/magnetic_module/hide(intact)
 	invisibility = intact ? INVISIBILITY_MAXIMUM : 0
-	updateicon()
+	update_icon()
 
 // update the icon_state
-/obj/machinery/magnetic_module/proc/updateicon()
+/obj/machinery/magnetic_module/update_icon()
 	var/state="floor_magnet"
 	var/onstate=""
 	if(!on)
@@ -161,7 +161,7 @@
 	else
 		use_power = NO_POWER_USE
 
-	updateicon()
+	update_icon()
 
 
 /obj/machinery/magnetic_module/proc/magnetic_process() // proc that actually does the magneting

code/game/machinery/navbeacon.dm

@@ -72,10 +72,10 @@
 // hide the object if turf is intact
 /obj/machinery/navbeacon/hide(intact)
 	invisibility = intact ? INVISIBILITY_MAXIMUM : 0
-	updateicon()
+	update_icon()
 
 // update the icon_state
-/obj/machinery/navbeacon/proc/updateicon()
+/obj/machinery/navbeacon/update_icon()
 	var/state="navbeacon[open]"
 
 	if(invisibility)
@@ -94,7 +94,7 @@
 
 		user.visible_message("[user] [open ? "opens" : "closes"] the beacon's cover.", "<span class='notice'>You [open ? "open" : "close"] the beacon's cover.</span>")
 
-		updateicon()
+		update_icon()
 
 	else if (istype(I, /obj/item/card/id)||istype(I, /obj/item/pda))
 		if(open)

code/game/machinery/suit_storage_unit.dm

@@ -326,6 +326,9 @@
 
 /obj/machinery/suit_storage_unit/attackby(obj/item/I, mob/user, params)
 	if(state_open && is_operational())
+		if(istype(I, /obj/item/clothing/head/mob_holder))
+			to_chat(user, "<span class='warning'>You can't quite fit that in while you hold it!</span>")
+			return
 		if(istype(I, /obj/item/clothing/suit))
 			if(suit)
 				to_chat(user, "<span class='warning'>The unit already contains a suit!.</span>")
@@ -437,4 +440,4 @@
 				if(I)
 					I.forceMove(loc)
 			. = TRUE
-	update_icon()
+	update_icon()

code/game/machinery/washing_machine.dm

@@ -219,6 +219,10 @@
 		update_icon()
 		return
 
+	if(istype(W, /obj/item/clothing/head/mob_holder))
+		to_chat(user, "<span class='warning'>It's too unwieldly to put in this way.</span>")
+		return 1
+
 	else if(user.a_intent != INTENT_HARM)
 
 		if (!state_open)