Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97

code/__DEFINES/misc.dm

@@ -266,6 +266,15 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 
 GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
 
+//pda icon reskins
+#define PDA_SKIN_CLASSIC "Classic"
+#define PDA_SKIN_ALT "Holographic"
+#define PDA_SKIN_RUGGED "Rugged"
+#define PDA_SKIN_MODERN "Modern"
+
+GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_SKIN_ALT = 'icons/obj/pda_alt.dmi',
+								PDA_SKIN_RUGGED = 'icons/obj/pda_rugged.dmi', PDA_SKIN_MODERN = 'icons/obj/pda_modern.dmi'))
+
 //Color Defines
 #define OOC_COLOR  "#002eb8"
 #define AOOC_COLOR "#b8002e"

code/__DEFINES/traits.dm

@@ -112,6 +112,8 @@
 #define TRAIT_PARALYSIS_R_ARM	"para-r-arm"
 #define TRAIT_PARALYSIS_L_LEG	"para-l-leg"
 #define TRAIT_PARALYSIS_R_LEG	"para-r-leg"
+#define	TRAIT_STRONG_GRABBER	"strong_grabber"
+#define	TRAIT_CALCIUM_HEALER	"calcium_healer"
 
  //non-mob traits
 #define TRAIT_PARALYSIS			"paralysis" //Used for limb-based paralysis, where replacing the limb will fix it

code/__HELPERS/mobs.dm

@@ -170,7 +170,7 @@
 		"balls_amount"		= 2,
 		"balls_sack_size"	= BALLS_SACK_SIZE_DEF,
 		"balls_size"		= BALLS_SIZE_DEF,
-		"balls_shape"		= "Pair",
+		"balls_shape"		= "Single",
 		"balls_cum_rate"	= CUM_RATE,
 		"balls_cum_mult"	= CUM_RATE_MULT,
 		"balls_efficiency"	= CUM_EFFICIENCY,

code/_globalvars/lists/maintenance_loot.dm

@@ -44,6 +44,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/flashlight = 4,
 	/obj/item/flashlight/pen = 1,
 	/obj/item/flashlight/glowstick/random = 4,
+	/obj/effect/spawner/lootdrop/mre = 3,
 	/obj/item/multitool = 2,
 	/obj/item/radio/off = 2,
 	/obj/item/t_scanner = 5,

code/_globalvars/misc.dm

@@ -18,3 +18,12 @@ GLOBAL_LIST_EMPTY(powernets)
 GLOBAL_VAR_INIT(bsa_unlock, FALSE)	//BSA unlocked by head ID swipes
 
 GLOBAL_LIST_EMPTY(player_details)	// ckey -> /datum/player_details
+
+// All religion stuff
+GLOBAL_VAR(religion)
+GLOBAL_VAR(deity)
+GLOBAL_VAR(bible_name)
+GLOBAL_VAR(bible_icon_state)
+GLOBAL_VAR(bible_item_state)
+GLOBAL_VAR(holy_weapon_type)
+GLOBAL_VAR(holy_armor_type)

code/_onclick/ai.dm

@@ -23,6 +23,9 @@
 		return
 	next_click = world.time + 1
 
+	if(!can_interact_with(A))
+		return
+
 	if(multicam_on)
 		var/turf/T = get_turf(A)
 		if(T)
@@ -60,7 +63,6 @@
 			controlled_mech.click_action(A, src, params) //Override AI normal click behavior.
 		return
 
-		return
 	if(modifiers["shift"])
 		ShiftClickOn(A)
 		return

code/controllers/subsystem/religion.dm

@@ -1,11 +0,0 @@
-SUBSYSTEM_DEF(religion)
-	name = "Religion"
-	flags = SS_NO_FIRE|SS_NO_INIT
-
-	var/religion
-	var/deity
-	var/bible_name
-	var/bible_icon_state
-	var/bible_item_state
-	var/holy_weapon_type
-	var/holy_armor_type

code/datums/mood_events/generic_negative_events.dm

@@ -117,6 +117,16 @@
 	description = "<span class='warning'>I'm missing my family heirloom...</span>\n"
 	mood_change = -4
 
+/datum/mood_event/loud_gong
+	description = "<span class='warning'>That loud gong noise really hurt my ears!</span>\n"
+	mood_change = -3
+	timeout = 1200
+
+/datum/mood_event/spooked
+	description = "<span class='warning'>The rattling of those bones...It still haunts me.</span>\n"
+	mood_change = -4
+	timeout = 2400
+
 //These are unused so far but I want to remember them to use them later
 /datum/mood_event/cloned_corpse
 	description = "<span class='boldwarning'>I recently saw my own corpse...</span>\n"

code/datums/wires/microwave.dm

@@ -0,0 +1,27 @@
+/datum/wires/microwave
+	holder_type = /obj/machinery/microwave
+	proper_name = "Microwave"
+
+/datum/wires/microwave/New(atom/holder)
+	wires = list(
+		WIRE_ACTIVATE
+	)
+	..()
+
+/datum/wires/microwave/interactable(mob/user)
+	. = FALSE
+	var/obj/machinery/microwave/M = holder
+	if(M.panel_open)
+		. = TRUE
+
+/datum/wires/microwave/on_pulse(wire)
+	var/obj/machinery/microwave/M = holder
+	switch(wire)
+		if(WIRE_ACTIVATE)
+			M.cook()
+
+/datum/wires/microwave/on_cut(wire, mend)
+	var/obj/machinery/microwave/M = holder
+	switch(wire)
+		if(WIRE_ACTIVATE)
+			M.wire_disabled = !mend

code/game/machinery/PDApainter.dm

@@ -35,15 +35,14 @@
 		/obj/item/pda/clear,
 		/obj/item/pda/syndicate,
 		/obj/item/pda/chameleon,
-		/obj/item/pda/chameleon/broken)
+		/obj/item/pda/chameleon/broken,
+		/obj/item/pda/lieutenant)
 
-	for(var/P in typesof(/obj/item/pda) - blocked)
-		var/obj/item/pda/D = new P
-
-		//D.name = "PDA Style [colorlist.len+1]" //Gotta set the name, otherwise it all comes up as "PDA"
-		D.name = D.icon_state //PDAs don't have unique names, but using the sprite names works.
-
-		src.colorlist += D
+	for(var/A in typesof(/obj/item/pda) - blocked)
+		var/obj/item/pda/P = A
+		var/PDA_name = initial(P.name)
+		colorlist += PDA_name
+		colorlist[PDA_name] = list(initial(P.icon_state), initial(P.desc), initial(P.overlays_offsets), initial(P.overlays_icons))
 
 /obj/machinery/pdapainter/Destroy()
 	QDEL_NULL(storedpda)
@@ -108,22 +107,20 @@
 	if(.)
 		return
 
-	if(storedpda)
-		var/obj/item/pda/P
-		P = input(user, "Select your color!", "PDA Painting") as null|anything in colorlist
-		if(!P)
-			return
-		if(!in_range(src, user))
-			return
-		if(!storedpda)//is the pda still there?
-			return
-		storedpda.icon_state = P.icon_state
-		storedpda.desc = P.desc
-		ejectpda()
-
-	else
+	if(!storedpda)
 		to_chat(user, "<span class='notice'>[src] is empty.</span>")
-
+		return
+	var/choice = input(user, "Select the new skin!", "PDA Painting") as null|anything in colorlist
+	if(!choice || !storedpda || !in_range(src, user))
+		return
+	var/list/P = colorlist[choice]
+	storedpda.icon_state = P[1]
+	storedpda.desc = P[2]
+	storedpda.overlays_offsets = P[3]
+	storedpda.overlays_icons = P[4]
+	storedpda.set_new_overlays()
+	storedpda.update_icon()
+	ejectpda()
 
 /obj/machinery/pdapainter/verb/ejectpda()
 	set name = "Eject PDA"

code/game/machinery/_machinery.dm

@@ -168,9 +168,11 @@ Class Procs:
 	update_icon()
 	updateUsrDialog()
 
-/obj/machinery/proc/dropContents()
+/obj/machinery/proc/dropContents(list/subset = null)
 	var/turf/T = get_turf(src)
 	for(var/atom/movable/A in contents)
+		if(subset && !(A in subset))
+			continue
 		A.forceMove(T)
 		if(isliving(A))
 			var/mob/living/L = A

code/game/machinery/computer/arcade/battle.dm

@@ -0,0 +1,206 @@
+// ** BATTLE ** //
+
+
+/obj/machinery/computer/arcade/battle
+	name = "arcade machine"
+	desc = "Does not support Pinball."
+	icon_state = "arcade"
+	circuit = /obj/item/circuitboard/computer/arcade/battle
+	var/enemy_name = "Space Villain"
+	var/temp = "Winners don't use space drugs" //Temporary message, for attack messages, etc
+	var/player_hp = 30 //Player health/attack points
+	var/player_mp = 10
+	var/enemy_hp = 45 //Enemy health/attack points
+	var/enemy_mp = 20
+	var/gameover = FALSE
+	var/blocked = FALSE //Player cannot attack/heal while set
+	var/turtle = 0
+
+	var/turn_speed = 5 //Measured in deciseconds.
+
+/obj/machinery/computer/arcade/battle/Reset()
+	var/name_action
+	var/name_part1
+	var/name_part2
+
+	name_action = pick("Defeat ", "Annihilate ", "Save ", "Strike ", "Stop ", "Destroy ", "Robust ", "Romance ", "Pwn ", "Own ", "Ban ")
+
+	name_part1 = pick("the Automatic ", "Farmer ", "Lord ", "Professor ", "the Cuban ", "the Evil ", "the Dread King ", "the Space ", "Lord ", "the Great ", "Duke ", "General ")
+	name_part2 = pick("Melonoid", "Murdertron", "Sorcerer", "Ruin", "Jeff", "Ectoplasm", "Crushulon", "Uhangoid", "Vhakoid", "Peteoid", "slime", "Griefer", "ERPer", "Lizard Man", "Unicorn", "Bloopers")
+
+	enemy_name = replacetext((name_part1 + name_part2), "the ", "")
+	name = (name_action + name_part1 + name_part2)
+
+/obj/machinery/computer/arcade/battle/ui_interact(mob/user)
+	. = ..()
+	var/dat = "<a href='byond://?src=[REF(src)];close=1'>Close</a>"
+	dat += "<center><h4>[enemy_name]</h4></center>"
+
+	dat += "<br><center><h3>[temp]</h3></center>"
+	dat += "<br><center>Health: [player_hp] | Magic: [player_mp] | Enemy Health: [enemy_hp]</center>"
+
+	if (gameover)
+		dat += "<center><b><a href='byond://?src=[REF(src)];newgame=1'>New Game</a>"
+	else
+		dat += "<center><b><a href='byond://?src=[REF(src)];attack=1'>Attack</a> | "
+		dat += "<a href='byond://?src=[REF(src)];heal=1'>Heal</a> | "
+		dat += "<a href='byond://?src=[REF(src)];charge=1'>Recharge Power</a>"
+
+	dat += "</b></center>"
+	var/datum/browser/popup = new(user, "arcade", "Space Villain 2000")
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
+	popup.open()
+
+/obj/machinery/computer/arcade/battle/Topic(href, href_list)
+	if(..())
+		return
+
+	if (!blocked && !gameover)
+		if (href_list["attack"])
+			blocked = TRUE
+			var/attackamt = rand(2,6)
+			temp = "You attack for [attackamt] damage!"
+			playsound(loc, 'sound/arcade/hit.ogg', 50, 1, extrarange = -3, falloff = 10)
+			updateUsrDialog()
+			if(turtle > 0)
+				turtle--
+
+			sleep(turn_speed)
+			enemy_hp -= attackamt
+			arcade_action(usr)
+
+		else if (href_list["heal"])
+			blocked = TRUE
+			var/pointamt = rand(1,3)
+			var/healamt = rand(6,8)
+			temp = "You use [pointamt] magic to heal for [healamt] damage!"
+			playsound(loc, 'sound/arcade/heal.ogg', 50, 1, extrarange = -3, falloff = 10)
+			updateUsrDialog()
+			turtle++
+
+			sleep(turn_speed)
+			player_mp -= pointamt
+			player_hp += healamt
+			blocked = TRUE
+			updateUsrDialog()
+			arcade_action(usr)
+
+		else if (href_list["charge"])
+			blocked = TRUE
+			var/chargeamt = rand(4,7)
+			temp = "You regain [chargeamt] points"
+			playsound(loc, 'sound/arcade/mana.ogg', 50, 1, extrarange = -3, falloff = 10)
+			player_mp += chargeamt
+			if(turtle > 0)
+				turtle--
+
+			updateUsrDialog()
+			sleep(turn_speed)
+			arcade_action(usr)
+
+	if (href_list["close"])
+		usr.unset_machine()
+		usr << browse(null, "window=arcade")
+
+	else if (href_list["newgame"]) //Reset everything
+		temp = "New Round"
+		player_hp = initial(player_hp)
+		player_mp = initial(player_mp)
+		enemy_hp = initial(enemy_hp)
+		enemy_mp = initial(enemy_mp)
+		gameover = FALSE
+		turtle = 0
+
+		if(obj_flags & EMAGGED)
+			Reset()
+			obj_flags &= ~EMAGGED
+
+	add_fingerprint(usr)
+	updateUsrDialog()
+	return
+
+/obj/machinery/computer/arcade/battle/proc/arcade_action(mob/user)
+	if ((enemy_mp <= 0) || (enemy_hp <= 0))
+		if(!gameover)
+			gameover = TRUE
+			temp = "[enemy_name] has fallen! Rejoice!"
+			playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff = 10)
+
+			if(obj_flags & EMAGGED)
+				new /obj/effect/spawner/newbomb/timer/syndicate(loc)
+				new /obj/item/clothing/head/collectable/petehat(loc)
+				message_admins("[ADMIN_LOOKUPFLW(usr)] has outbombed Cuban Pete and been awarded a bomb.")
+				log_game("[key_name(usr)] has outbombed Cuban Pete and been awarded a bomb.")
+				Reset()
+				obj_flags &= ~EMAGGED
+			else
+				prizevend(user)
+			SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("win", (obj_flags & EMAGGED ? "emagged":"normal")))
+
+
+	else if ((obj_flags & EMAGGED) && (turtle >= 4))
+		var/boomamt = rand(5,10)
+		temp = "[enemy_name] throws a bomb, exploding you for [boomamt] damage!"
+		playsound(loc, 'sound/arcade/boom.ogg', 50, 1, extrarange = -3, falloff = 10)
+		player_hp -= boomamt
+
+	else if ((enemy_mp <= 5) && (prob(70)))
+		var/stealamt = rand(2,3)
+		temp = "[enemy_name] steals [stealamt] of your power!"
+		playsound(loc, 'sound/arcade/steal.ogg', 50, 1, extrarange = -3, falloff = 10)
+		player_mp -= stealamt
+		updateUsrDialog()
+
+		if (player_mp <= 0)
+			gameover = TRUE
+			sleep(turn_speed)
+			temp = "You have been drained! GAME OVER"
+			playsound(loc, 'sound/arcade/lose.ogg', 50, 1, extrarange = -3, falloff = 10)
+			if(obj_flags & EMAGGED)
+				usr.gib()
+			SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("loss", "mana", (obj_flags & EMAGGED ? "emagged":"normal")))
+
+	else if ((enemy_hp <= 10) && (enemy_mp > 4))
+		temp = "[enemy_name] heals for 4 health!"
+		playsound(loc, 'sound/arcade/heal.ogg', 50, 1, extrarange = -3, falloff = 10)
+		enemy_hp += 4
+		enemy_mp -= 4
+
+	else
+		var/attackamt = rand(3,6)
+		temp = "[enemy_name] attacks for [attackamt] damage!"
+		playsound(loc, 'sound/arcade/hit.ogg', 50, 1, extrarange = -3, falloff = 10)
+		player_hp -= attackamt
+
+	if ((player_mp <= 0) || (player_hp <= 0))
+		gameover = TRUE
+		temp = "You have been crushed! GAME OVER"
+		playsound(loc, 'sound/arcade/lose.ogg', 50, 1, extrarange = -3, falloff = 10)
+		if(obj_flags & EMAGGED)
+			usr.gib()
+		SSblackbox.record_feedback("nested tally", "arcade_results", 1, list("loss", "hp", (obj_flags & EMAGGED ? "emagged":"normal")))
+
+	blocked = FALSE
+	return
+
+
+/obj/machinery/computer/arcade/battle/emag_act(mob/user)
+	if(obj_flags & EMAGGED)
+		return
+	to_chat(user, "<span class='warning'>A mesmerizing Rhumba beat starts playing from the arcade machine's speakers!</span>")
+	temp = "If you die in the game, you die for real!"
+	player_hp = 30
+	player_mp = 10
+	enemy_hp = 45
+	enemy_mp = 20
+	gameover = FALSE
+	blocked = FALSE
+
+	obj_flags |= EMAGGED
+
+	enemy_name = "Cuban Pete"
+	name = "Outbomb Cuban Pete"
+
+
+	updateUsrDialog()

code/game/machinery/computer/arcade/minesweeper.dm

@@ -0,0 +1,390 @@
+#define MINESWEEPER_GAME_MAIN_MENU	0
+#define MINESWEEPER_GAME_PLAYING	1
+#define MINESWEEPER_GAME_LOST		2
+#define MINESWEEPER_GAME_WON		3
+#define MINESWEEPERIMG(what) {"<img style='border:0' <span class="minesweeper16x16 [#what]"></span>"} //Basically bypassing asset.icon_tag()
+
+/obj/machinery/computer/arcade/minesweeper
+	name = "Minesweeper"
+	desc = "An arcade machine that generates grids. It seems that the machine sparks and screeches when a grid is generated, as if it cannot cope with the intensity of generating the grid."
+	icon_state = "arcade"
+	circuit = /obj/item/circuitboard/computer/arcade/minesweeper
+	var/area
+	var/difficulty = ""	//To show what difficulty you are playing
+	var/flag_text = ""
+	var/flagging = FALSE
+	var/game_status = MINESWEEPER_GAME_MAIN_MENU
+	var/mine_limit = 0
+	var/mine_placed = 0
+	var/mine_sound = TRUE	//So it doesn't get repeated when multiple mines are exposed
+	var/randomcolour = 1
+	var/randomnumber = 1	//Random emagged game iteration number to be displayed, put here so it is persistent across one individual arcade machine
+	var/safe_squares_revealed
+	var/saved_web = ""	//To display the web if you click on the arcade
+	var/win_condition
+	var/rows = 1
+	var/columns = 1
+	var/table[31][51]	//Make the board boys, 30x50 board
+	var/spark_spam = FALSE
+
+/obj/machinery/computer/arcade/minesweeper/interact(mob/user)
+	var/emagged = CHECK_BITFIELD(obj_flags, EMAGGED)
+	var/dat
+	if(game_status == MINESWEEPER_GAME_MAIN_MENU)
+		dat += "<head><title>Minesweeper</title></head><div align='center'><b>Minesweeper[emagged ? " <font color='red'>EXTREME EDITION</font>: Iteration <font color='[randomcolour]'>#[randomnumber]</font>" : ""]</b><br>"	//Different colour mix for every random number made
+		dat += "<font size='2'> [emagged ? "Explode in the game, explode in real life" : "Reveal all the squares without hitting a mine"]!<br>What difficulty do you want to play?<br><br><br><br><b><a href='byond://?src=[REF(src)];Easy=1'><font color='#cc66ff'>Easy (9x9 board, 10 mines)</font></a><br><a href='byond://?src=[REF(src)];Intermediate=1'><font color='#cc66ff'>Intermediate (16x16 board, 40 mines)</font></a><br><a href='byond://?src=[REF(src)];Hard=1'><font color='#cc66ff'>Hard (16x30 board, 99 mines)</font></a><br><a href='byond://?src=[REF(src)];Custom=1'><font color='#cc66ff'>Custom</font>"
+	else
+		dat = saved_web
+	user = usr
+
+	var/datum/asset/assets = get_asset_datum(/datum/asset/spritesheet/simple/minesweeper)
+	assets.send(user)
+
+	user << browse(dat,"window=minesweeper,size=400x500")
+	add_fingerprint(user)
+
+	. = ..()
+
+/obj/machinery/computer/arcade/minesweeper/proc/reset_spark_spam()
+	spark_spam = FALSE
+
+/obj/machinery/computer/arcade/minesweeper/Topic(href, href_list)
+	. = ..()
+	if(.)
+		return
+
+	var/exploding_hell = FALSE	//For emagged failures
+	var/reset_board = FALSE
+	var/mob/living/user = usr	//To identify who the hell is using this window, this should also make things like aliens and monkeys able to use the machine!!
+	var/web_difficulty_menu = "<font size='2'> Reveal all the squares without hitting a mine!<br>What difficulty do you want to play?<br><br><br><br><b><a href='byond://?src=[REF(src)];Easy=1'><font color='#cc66ff'>Easy (9x9 board, 10 mines)</font></a><br><a href='byond://?src=[REF(src)];Intermediate=1'><font color='#cc66ff'>Intermediate (16x16 board, 40 mines)</font></a><br><a href='byond://?src=[REF(src)];Hard=1'><font color='#cc66ff'>Hard (16x30 board, 99 mines)</font></a><br><a href='byond://?src=[REF(src)];Custom=1'><font color='#cc66ff'>Custom</font>"
+	var/web = "<head><title>Minesweeper</title></head><div align='center'><b>Minesweeper</b><br>"
+	var/static_web = "<head><title>Minesweeper</title></head><div align='center'><b>Minesweeper</b><br>"	//When we need to revert to the main menu we set web as this
+	web = static_web
+
+	if(CHECK_BITFIELD(obj_flags, EMAGGED))
+		web = "<head><title>Minesweeper</title></head><body><div align='center'><b>Minesweeper <font color='red'>EXTREME EDITION</font>: Iteration <font color='[randomcolour]'>#[randomnumber]</font></b><br>"	//Different colour mix for every random number made
+		if(!spark_spam)
+			do_sparks(5, 1, src)
+			spark_spam = TRUE
+			addtimer(CALLBACK(src, .proc/reset_spark_spam), 30)
+
+
+	var/startup_sound = CHECK_BITFIELD(obj_flags, EMAGGED) ? 'sound/arcade/minesweeper_emag2.ogg' : 'sound/arcade/minesweeper_startup.ogg'
+
+	if(href_list["Main_Menu"])
+		game_status = MINESWEEPER_GAME_MAIN_MENU
+		mine_limit = 0
+		rows = 0
+		columns = 0
+		mine_placed = 0
+	if(href_list["Easy"])
+		playsound(loc, startup_sound, 50, 0, extrarange = -3, falloff = 10)
+		flag_text = "OFF"
+		game_status = MINESWEEPER_GAME_PLAYING
+		reset_board = TRUE
+		difficulty = "Easy"
+		rows = 10	//9x9 board
+		columns = 10
+		mine_limit = 10
+	if(href_list["Intermediate"])
+		playsound(loc, startup_sound, 50, 0, extrarange = -3, falloff = 10)
+		flag_text = "OFF"
+		game_status = MINESWEEPER_GAME_PLAYING
+		reset_board = TRUE
+		difficulty = "Intermediate"
+		rows = 17	//16x16 board
+		columns = 17
+		mine_limit = 40
+	if(href_list["Hard"])
+		playsound(loc, startup_sound, 50, 0, extrarange = -3, falloff = 10)
+		flag_text = "OFF"
+		game_status = MINESWEEPER_GAME_PLAYING
+		reset_board = TRUE
+		difficulty = "Hard"
+		rows = 17	//16x30 board
+		columns = 31
+		mine_limit = 99
+	if(href_list["Custom"])
+		if(custom_generation(usr))
+			flag_text = "OFF"
+			game_status = MINESWEEPER_GAME_PLAYING
+			reset_board = TRUE
+			difficulty = "Custom"
+			playsound(loc, startup_sound, 50, 0, extrarange = -3, falloff = 10)
+	if(href_list["Flag"])
+		playsound(loc, 'sound/arcade/minesweeper_boardpress.ogg', 50, 0, extrarange = -3, falloff = 10)
+		if(!flagging)
+			flagging = TRUE
+			flag_text = "ON"
+		else
+			flagging = FALSE
+			flag_text = "OFF"
+
+	if(game_status == MINESWEEPER_GAME_MAIN_MENU)
+		if(CHECK_BITFIELD(obj_flags, EMAGGED))
+			playsound(loc, 'sound/arcade/minesweeper_emag2.ogg', 50, 0, extrarange = -3, falloff = 10)
+			web += "<font size='2'>Explode in the game, explode in real life!<br>What difficulty do you want to play?<br><br><br><br><b><a href='byond://?src=[REF(src)];Easy=1'><font color='#cc66ff'>Easy (9x9 board, 10 mines)</font></a><br><a href='byond://?src=[REF(src)];Intermediate=1'><font color='#cc66ff'>Intermediate (16x16 board, 40 mines)</font></a><br><a href='byond://?src=[REF(src)];Hard=1'><font color='#cc66ff'>Hard (16x30 board, 99 mines)</font></a><br><a href='byond://?src=[REF(src)];Custom=1'><font color='#cc66ff'>Custom</font>"
+		else
+			playsound(loc, 'sound/arcade/minesweeper_startup.ogg', 50, 0, extrarange = -3, falloff = 10)
+			web += web_difficulty_menu
+
+	if(game_status == MINESWEEPER_GAME_PLAYING)
+		mine_sound = TRUE
+
+	area = (rows-1)*(columns-1)
+
+	if(reset_board)
+		mine_placed = 0
+		var/reset_everything = TRUE
+		make_mines(reset_everything)
+
+	safe_squares_revealed = 0
+	win_condition = area-mine_placed
+
+	if(game_status != MINESWEEPER_GAME_MAIN_MENU)
+		for(var/y1=1;y1<rows;y1++)
+			for(var/x1=1;x1<columns;x1++)
+				var/coordinates
+				coordinates = (y1*100)+x1
+				if(href_list["[coordinates]"])
+					if(game_status == MINESWEEPER_GAME_PLAYING)	//Don't do anything if we won or something
+						if(!flagging)
+							if(table[y1][x1] < 10 && table[y1][x1] >= 0)	//Check that it's not already revealed, and stop flag removal if we're out of flag mode
+								table[y1][x1] += 10
+								if(table[y1][x1] != 10)
+									playsound(loc, 'sound/arcade/minesweeper_boardpress.ogg', 50, 0, extrarange = -3, falloff = 10)
+								else
+									if(game_status != MINESWEEPER_GAME_LOST && game_status != MINESWEEPER_GAME_WON)
+										game_status = MINESWEEPER_GAME_LOST
+										if(CHECK_BITFIELD(obj_flags, EMAGGED) && !exploding_hell)
+											exploding_hell  = TRUE
+											explode_EVERYTHING()
+										if(mine_sound)
+											switch(rand(1,3))	//Play every time a mine is hit
+												if(1)
+													playsound(loc, 'sound/arcade/minesweeper_explosion1.ogg', 50, 0, extrarange = -3, falloff = 10)
+												if(2)
+													playsound(loc, 'sound/arcade/minesweeper_explosion2.ogg', 50, 0, extrarange = -3, falloff = 10)
+												if(3)
+													playsound(loc, 'sound/arcade/minesweeper_explosion3.ogg', 50, 0, extrarange = -3, falloff = 10)
+											mine_sound = FALSE
+						else
+							playsound(loc, 'sound/arcade/minesweeper_boardpress.ogg', 50, 0, extrarange = -3, falloff = 10)
+							if(table[y1][x1] >= 0)	//Check that it's not already flagged
+								table[y1][x1] -= 10
+							else if(table[y1][x1] < 0)	//If flagged, remove the flag
+								table[y1][x1] += 10
+				if(href_list["same_board"])	//Reset the board... kinda
+					if(game_status != MINESWEEPER_GAME_PLAYING)
+						game_status = MINESWEEPER_GAME_PLAYING
+					if(table[y1][x1] >= 10)	//If revealed, become unrevealed!
+						playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, 0, extrarange = -3, falloff = 10)
+						table[y1][x1] -= 10
+				if(table[y1][x1] > 10 && !reset_board)
+					safe_squares_revealed += 1
+				var/y2 = y1
+				var/x2 = x1
+				work_squares(y2, x2)	//Work squares while in this loop so there's less load
+				reset_board = FALSE
+
+		web += "<table>"	//Start setting up the html table
+		web += "<tbody>"
+		for(var/y1=1;y1<rows;y1++)
+			web += "<tr>"
+			for(var/x1=1;x1<columns;x1++)
+				var/coordinates
+				coordinates = (y1*100)+x1
+				switch(table[y1][x1])
+					if(-10 to -1)
+						if(game_status != MINESWEEPER_GAME_PLAYING)
+							web += "<td>[MINESWEEPERIMG(flag)]</td>"
+						else
+							web += "<td><a href='byond://?src=[REF(src)];[coordinates]=1'>[MINESWEEPERIMG(flag)]</a></td>"
+					if(0)
+						if(game_status != MINESWEEPER_GAME_PLAYING)
+							web += "<td>[MINESWEEPERIMG(mine)]</td>"
+						else
+							web += "<td><a href='byond://?src=[REF(src)];[coordinates]=1'>[MINESWEEPERIMG(hidden)]</a></td>"	//Make unique hrefs for every square
+					if(1 to 9)
+						if(game_status != MINESWEEPER_GAME_PLAYING)
+							web += "<td>[MINESWEEPERIMG(hidden)]</td>"
+						else
+							web += "<td><a href='byond://?src=[REF(src)];[coordinates]=1'>[MINESWEEPERIMG(hidden)]</a></td>"	//Make unique hrefs for every square
+					if(10)
+						web += "<td>[MINESWEEPERIMG(minehit)]</td>"
+					if(11)
+						web += "<td>[MINESWEEPERIMG(empty)]</td>"
+					if(12)
+						web += "<td>[MINESWEEPERIMG(1)]</td>"
+					if(13)
+						web += "<td>[MINESWEEPERIMG(2)]</td>"
+					if(14)
+						web += "<td>[MINESWEEPERIMG(3)]</td>"
+					if(15)
+						web += "<td>[MINESWEEPERIMG(4)]</td>"
+					if(16)
+						web += "<td>[MINESWEEPERIMG(5)]</td>"
+					if(17)
+						web += "<td>[MINESWEEPERIMG(6)]</td>"
+					if(18)
+						web += "<td>[MINESWEEPERIMG(7)]</td>"
+					if(19)
+						web += "<td>[MINESWEEPERIMG(8)]</td>"
+			web += "</tr>"
+		web += "</table>"
+		web += "</tbody>"
+	web += "<br>"
+
+	if(safe_squares_revealed >= win_condition && game_status == MINESWEEPER_GAME_PLAYING)
+		game_status = MINESWEEPER_GAME_WON
+		if(rows < 10 || columns < 10)	//If less than easy difficulty
+			playsound(loc, 'sound/arcade/minesweeper_winfail.ogg', 50, 0, extrarange = -3, falloff = 10)
+			say("You cleared the board of all mines, but you picked too small of a board! Try again with at least a 9x9 board!")
+		else
+			playsound(loc, 'sound/arcade/minesweeper_win.ogg', 50, 0, extrarange = -3, falloff = 10)
+			say("You cleared the board of all mines! Congratulations!")
+			if(CHECK_BITFIELD(obj_flags, EMAGGED))
+				var/itemname
+				switch(rand(1,3))
+					if(1)
+						itemname = "a syndicate bomb beacon"
+						new /obj/item/sbeacondrop/bomb(loc)
+					if(2)
+						itemname = "a grenade launcher"
+						new /obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted(loc)
+						new /obj/item/ammo_casing/a40mm(loc)
+						new /obj/item/ammo_casing/a40mm(loc)
+						new /obj/item/ammo_casing/a40mm(loc)
+					if(3)
+						itemname = "two bags of c4"
+						new /obj/item/storage/backpack/duffelbag/syndie/c4(loc)
+						new /obj/item/storage/backpack/duffelbag/syndie/x4(loc)
+				message_admins("[key_name_admin(user)] won emagged Minesweeper and got [itemname]!")
+				visible_message("<span class='notice'>[src] dispenses [itemname]!</span>", "<span class='notice'>You hear a chime and a clunk.</span>")
+				DISABLE_BITFIELD(obj_flags, EMAGGED)
+			else
+				var/dope_prizes = (area >= 480) ? list(ARCADE_WEIGHT_RARE) : (area >= 256) ? list(ARCADE_WEIGHT_RARE, ARCADE_WEIGHT_TRICK) : null
+				prizevend(user, dope_prizes)
+
+	if(game_status == MINESWEEPER_GAME_WON)
+		web += "[(rows < 10 || columns < 10) ? "<font size='4'>You won, but your board was too small! Pick a bigger board next time!" : "<font size='6'>Congratulations, you have won!"]<br><font size='3'>Want to play again?<br><b><a href='byond://?src=[REF(src)];Easy=1'><font color='#cc66ff'>Easy (9x9 board, 10 mines)</font></a><br><a href='byond://?src=[REF(src)];Intermediate=1'><font color='#cc66ff'>Intermediate (16x16 board, 40 mines)</font></a><br><a href='byond://?src=[REF(src)];Hard=1'><font color='#cc66ff'>Hard (16x30 board, 99 mines)</font></a><br><a href='byond://?src=[REF(src)];Custom=1'><font color='#cc66ff'>Custom</font></a></b><br><a href='byond://?src=[REF(src)];same_board=1'><font color='#cc66ff'>Play on the same board</font></a><br><a href='byond://?src=[REF(src)];Main_Menu=1'><font color='#cc66ff'>Return to Main Menu</font></a></b><br>"
+
+	if(game_status == MINESWEEPER_GAME_LOST)
+		web += "<font size='6'>You have lost!<br><font size='3'>Try again?<br><b><a href='byond://?src=[REF(src)];Easy=1'><font color='#cc66ff'>Easy (9x9 board, 10 mines)</font></a><br><a href='byond://?src=[REF(src)];Intermediate=1'><font color='#cc66ff'>Intermediate (16x16 board, 40 mines)</font></a><br><a href='byond://?src=[REF(src)];Hard=1'><font color='#cc66ff'>Hard (16x30 board, 99 mines)</font></a><br><a href='byond://?src=[REF(src)];Custom=1'><font color='#cc66ff'>Custom</font></a></b><br><a href='byond://?src=[REF(src)];same_board=1'><font color='#cc66ff'>Play on the same board</font></a><br><a href='byond://?src=[REF(src)];Main_Menu=1'><font color='#cc66ff'>Return to Main Menu</font></a></b><br>"
+
+	if(game_status == MINESWEEPER_GAME_PLAYING)
+		web += "<a href='byond://?src=[REF(src)];Main_Menu=1'><font color='#cc66ff'>Return to Main Menu</font></a><br>"
+		web += "<div align='right'>Difficulty: [difficulty]<br>Mines: [mine_placed]<br>Rows: [rows-1]<br>Columns: [columns-1]<br><a href='byond://?src=[REF(src)];Flag=1'><font color='#cc66ff'>Flagging mode: [flag_text]</font></a></div>"
+
+	web += "</div>"
+	var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/simple/minesweeper)
+	saved_web = sheet.css_tag()
+	saved_web += web
+	updateDialog()
+	return
+
+/obj/machinery/computer/arcade/minesweeper/emag_act(mob/user)
+	if(CHECK_BITFIELD(obj_flags, EMAGGED))
+		return
+	desc = "An arcade machine that generates grids. It's clunking and sparking everywhere, almost as if threatening to explode at any moment!"
+	do_sparks(5, 1, src)
+	randomnumber = rand(1,255)
+	randomcolour = rgb(randomnumber,randomnumber/2,randomnumber/3)
+	ENABLE_BITFIELD(obj_flags, EMAGGED)
+	if(game_status == MINESWEEPER_GAME_MAIN_MENU)
+		to_chat(user, "<span class='warning'>An ominous tune plays from the arcade's speakers!</span>")
+		playsound(user, 'sound/arcade/minesweeper_emag1.ogg', 100, 0, extrarange = 3, falloff = 10)
+	else	//Can't let you do that, star fox!
+		to_chat(user, "<span class='warning'>The machine buzzes and sparks... the game has been reset!</span>")
+		playsound(user, 'sound/machines/buzz-sigh.ogg', 100, 0, extrarange = 3, falloff = 10)	//Loud buzz
+		game_status = MINESWEEPER_GAME_MAIN_MENU
+
+/obj/machinery/computer/arcade/minesweeper/proc/custom_generation(mob/user)
+	playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, 0, extrarange = -3, falloff = 10)	//Entered into the menu so ping sound
+	var/new_rows = input(user, "How many rows do you want? (Minimum: 4, Maximum: 30)", "Minesweeper Rows") as null|num
+	if(!new_rows || !user.canUseTopic(src, !issilicon(user)))
+		return FALSE
+	new_rows = CLAMP(new_rows + 1, 4, 30)
+	playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, 0, extrarange = -3, falloff = 10)
+	var/new_columns = input(user, "How many columns do you want? (Minimum: 4, Maximum: 50)", "Minesweeper Squares") as null|num
+	if(!new_columns || !user.canUseTopic(src, !issilicon(user)))
+		return FALSE
+	new_columns = CLAMP(new_columns + 1, 4, 50)
+	playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, 0, extrarange = -3, falloff = 10)
+	var/grid_area = (new_rows - 1) * (new_columns - 1)
+	var/lower_limit = round(grid_area*0.156)
+	var/upper_limit = round(grid_area*0.85)
+	var/new_mine_limit = input(user, "How many mines do you want? (Minimum: [lower_limit], Maximum: [upper_limit])", "Minesweeper Mines") as null|num
+	if(!new_mine_limit || !user.canUseTopic(src, !issilicon(user)))
+		return FALSE
+	playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, 0, extrarange = -3, falloff = 10)
+	rows = new_rows
+	columns = new_columns
+	mine_limit = CLAMP(new_mine_limit, lower_limit, upper_limit)
+	return TRUE
+
+/obj/machinery/computer/arcade/minesweeper/proc/make_mines(var/reset_everything)
+	if(mine_placed < mine_limit)
+		for(var/y1=1;y1<rows;y1++)	//Board resetting and mine building
+			for(var/x1=1;x1<columns;x1++)
+				if(prob(area/mine_limit) && mine_placed < mine_limit && table[y1][x1] != 0)	//Unlikely for this to happen but this has eaten mines before
+					table[y1][x1] = 0
+					mine_placed += 1
+				else if(reset_everything)
+					table[y1][x1] = 1
+		reset_everything = FALSE
+		make_mines()	//In case the first pass doesn't generate enough mines
+
+/obj/machinery/computer/arcade/minesweeper/proc/work_squares(var/y2, var/x2, var/y3, var/x3)
+	if(y3 > 0 && x3 > 0)
+		y2 = y3
+		x2 = x3
+	if(table[y2][x2] == 1)
+		for(y3=y2-1;y3<y2+2;y3++)
+			if(y3 >= rows || y3 < 1)
+				continue
+			for(x3=x2-1;x3<x2+2;x3++)
+				if(x3 >= columns || x3 < 1)
+					continue
+				if(table[y3][x3] == 0)
+					table[y2][x2] += 1
+	if(table[y2][x2] == 11)
+		for(y3=y2-1;y3<y2+2;y3++)
+			if(y3 >= rows || y3 < 1)
+				continue
+			for(x3=x2-1;x3<x2+2;x3++)
+				if(x3 >= columns || x3 < 1)
+					continue
+				if(table[y3][x3] > 0 && table[y3][x3] < 10)
+					table[y3][x3] += 10
+					work_squares(y3, x3)	//Refresh so we check everything we might be missing
+
+/obj/machinery/computer/arcade/minesweeper/proc/explode_EVERYTHING()
+	var/mob/living/user = usr
+	to_chat(user, "<span class='boldwarning'>You feel a great sense of dread wash over you, as if you just unleashed armageddon upon yourself!</span>")
+	var/row_limit = rows-1
+	var/column_limit = columns-1
+	var/mine_limit_v2 = mine_limit
+	if(rows > 11)
+		row_limit = 10
+	if(columns > 11)
+		column_limit = 10
+	if(mine_limit > (rows*columns) * 0.25)
+		mine_limit_v2 = 24
+	message_admins("[key_name_admin(user)] failed an emagged Minesweeper arcade and has unleashed an explosion armageddon of size [row_limit],[column_limit] around [ADMIN_LOOKUPFLW(user.loc)]!")
+	if(mine_limit_v2 < 10)
+		explosion(loc, 2, 5, 10, 15)	//Thought you could survive by putting as few mines as possible, huh??
+	else
+		explosion(loc, 1, 3, rand(1,5), rand(1,10))
+	for(var/y69=y-row_limit;y69<y+row_limit;y69++)	//Create a shitton of explosions in irl turfs if we lose, it will probably kill us
+		for(var/x69=x-column_limit;x69<x+column_limit;x69++)
+			if(prob(mine_limit_v2))	//Probability of explosion happening, according to how many mines were on the board... up to a limit
+				var/explosionloc
+				explosionloc = locate(y69,x69,z)
+				explosion(explosionloc, 0, rand(1,2),rand(1,5),rand(3,10), adminlog = FALSE)
+
+#undef MINESWEEPERIMG
+#undef MINESWEEPER_GAME_MAIN_MENU
+#undef MINESWEEPER_GAME_PLAYING
+#undef MINESWEEPER_GAME_LOST
+#undef MINESWEEPER_GAME_WON

code/game/machinery/computer/arcade/misc_arcade.dm

@@ -0,0 +1,31 @@
+// Memeorable yet too short arcade games ahead.
+
+// ** AMPUTATION ** //
+
+/obj/machinery/computer/arcade/amputation
+	name = "Mediborg's Amputation Adventure"
+	desc = "A picture of a blood-soaked medical cyborg flashes on the screen. The mediborg has a speech bubble that says, \"Put your hand in the machine if you aren't a <b>coward!</b>\""
+	icon_state = "arcade"
+	circuit = /obj/item/circuitboard/computer/arcade/amputation
+
+/obj/machinery/computer/arcade/amputation/attack_hand(mob/user)
+	if(!iscarbon(user))
+		return
+	var/mob/living/carbon/c_user = user
+	if(!c_user.get_bodypart(BODY_ZONE_L_ARM) && !c_user.get_bodypart(BODY_ZONE_R_ARM))
+		return
+	to_chat(c_user, "<span class='warning'>You move your hand towards the machine, and begin to hesitate as a bloodied guillotine emerges from inside of it...</span>")
+	if(do_after(c_user, 50, target = src))
+		to_chat(c_user, "<span class='userdanger'>The guillotine drops on your arm, and the machine sucks it in!</span>")
+		playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+		var/which_hand = BODY_ZONE_L_ARM
+		if(!(c_user.active_hand_index % 2))
+			which_hand = BODY_ZONE_R_ARM
+		var/obj/item/bodypart/chopchop = c_user.get_bodypart(which_hand)
+		chopchop.dismember()
+		qdel(chopchop)
+		playsound(loc, 'sound/arcade/win.ogg', 50, 1, extrarange = -3, falloff = 10)
+		for(var/i=1; i<=rand(3,5); i++)
+			prizevend(user)
+	else
+		to_chat(c_user, "<span class='notice'>You (wisely) decide against putting your hand in the machine.</span>")

code/game/machinery/computer/arcade/orion_trail.dm

@@ -0,0 +1,809 @@
+
+
+// *** THE ORION TRAIL ** //
+
+#define ORION_TRAIL_WINTURN		9
+
+//Orion Trail Events
+#define ORION_TRAIL_RAIDERS		"Raiders"
+#define ORION_TRAIL_FLUX		"Interstellar Flux"
+#define ORION_TRAIL_ILLNESS		"Illness"
+#define ORION_TRAIL_BREAKDOWN	"Breakdown"
+#define ORION_TRAIL_LING		"Changelings?"
+#define ORION_TRAIL_LING_ATTACK "Changeling Ambush"
+#define ORION_TRAIL_MALFUNCTION	"Malfunction"
+#define ORION_TRAIL_COLLISION	"Collision"
+#define ORION_TRAIL_SPACEPORT	"Spaceport"
+#define ORION_TRAIL_BLACKHOLE	"BlackHole"
+
+#define ORION_STATUS_START		1
+#define ORION_STATUS_NORMAL		2
+#define ORION_STATUS_GAMEOVER	3
+#define ORION_STATUS_MARKET		4
+
+/obj/machinery/computer/arcade/orion_trail
+	name = "The Orion Trail"
+	desc = "Learn how our ancestors got to Orion, and have fun in the process!"
+	icon_state = "arcade"
+	circuit = /obj/item/circuitboard/computer/arcade/orion_trail
+	var/busy = FALSE //prevent clickspam that allowed people to ~speedrun~ the game.
+	var/engine = 0
+	var/hull = 0
+	var/electronics = 0
+	var/food = 80
+	var/fuel = 60
+	var/turns = 4
+	var/alive = 4
+	var/eventdat = null
+	var/event = null
+	var/list/settlers = list("Harry","Larry","Bob")
+	var/list/events = list(ORION_TRAIL_RAIDERS		= 3,
+						   ORION_TRAIL_FLUX			= 1,
+						   ORION_TRAIL_ILLNESS		= 3,
+						   ORION_TRAIL_BREAKDOWN	= 2,
+						   ORION_TRAIL_LING			= 3,
+						   ORION_TRAIL_MALFUNCTION	= 2,
+						   ORION_TRAIL_COLLISION	= 1,
+						   ORION_TRAIL_SPACEPORT	= 2
+						   )
+	var/list/stops = list()
+	var/list/stopblurbs = list()
+	var/lings_aboard = 0
+	var/spaceport_raided = 0
+	var/spaceport_freebie = 0
+	var/last_spaceport_action = ""
+	var/gameStatus = ORION_STATUS_START
+	var/canContinueEvent = 0
+
+/obj/machinery/computer/arcade/orion_trail/kobayashi
+	name = "Kobayashi Maru control computer"
+	desc = "A test for cadets"
+	icon = 'icons/obj/machines/particle_accelerator.dmi'
+	icon_state = "control_boxp"
+	events = list("Raiders" = 3, "Interstellar Flux" = 1, "Illness" = 3, "Breakdown" = 2, "Malfunction" = 2, "Collision" = 1, "Spaceport" = 2)
+	prizes = list(/obj/item/paper/fluff/holodeck/trek_diploma = 1)
+	settlers = list("Kirk","Worf","Gene")
+
+/obj/machinery/computer/arcade/orion_trail/Reset()
+	// Sets up the main trail
+	stops = list("Pluto","Asteroid Belt","Proxima Centauri","Dead Space","Rigel Prime","Tau Ceti Beta","Black Hole","Space Outpost Beta-9","Orion Prime")
+	stopblurbs = list(
+		"Pluto, long since occupied with long-range sensors and scanners, stands ready to, and indeed continues to probe the far reaches of the galaxy.",
+		"At the edge of the Sol system lies a treacherous asteroid belt. Many have been crushed by stray asteroids and misguided judgement.",
+		"The nearest star system to Sol, in ages past it stood as a reminder of the boundaries of sub-light travel, now a low-population sanctuary for adventurers and traders.",
+		"This region of space is particularly devoid of matter. Such low-density pockets are known to exist, but the vastness of it is astounding.",
+		"Rigel Prime, the center of the Rigel system, burns hot, basking its planetary bodies in warmth and radiation.",
+		"Tau Ceti Beta has recently become a waypoint for colonists headed towards Orion. There are many ships and makeshift stations in the vicinity.",
+		"Sensors indicate that a black hole's gravitational field is affecting the region of space we were headed through. We could stay of course, but risk of being overcome by its gravity, or we could change course to go around, which will take longer.",
+		"You have come into range of the first man-made structure in this region of space. It has been constructed not by travellers from Sol, but by colonists from Orion. It stands as a monument to the colonists' success.",
+		"You have made it to Orion! Congratulations! Your crew is one of the few to start a new foothold for mankind!"
+		)
+
+/obj/machinery/computer/arcade/orion_trail/proc/newgame()
+	// Set names of settlers in crew
+	settlers = list()
+	for(var/i = 1; i <= 3; i++)
+		add_crewmember()
+	add_crewmember("[usr]")
+	// Re-set items to defaults
+	engine = 1
+	hull = 1
+	electronics = 1
+	food = 80
+	fuel = 60
+	alive = 4
+	turns = 1
+	event = null
+	gameStatus = ORION_STATUS_NORMAL
+	lings_aboard = 0
+
+	//spaceport junk
+	spaceport_raided = 0
+	spaceport_freebie = 0
+	last_spaceport_action = ""
+
+/obj/machinery/computer/arcade/orion_trail/ui_interact(mob/user)
+	. = ..()
+	if(fuel <= 0 || food <=0 || settlers.len == 0)
+		gameStatus = ORION_STATUS_GAMEOVER
+		event = null
+	var/dat = ""
+	if(gameStatus == ORION_STATUS_GAMEOVER)
+		dat = "<center><h1>Game Over</h1></center>"
+		dat += "Like many before you, your crew never made it to Orion, lost to space... <br><b>Forever</b>."
+		if(!settlers.len)
+			dat += "<br>Your entire crew died, and your ship joins the fleet of ghost-ships littering the galaxy."
+		else
+			if(food <= 0)
+				dat += "<br>You ran out of food and starved."
+				if(obj_flags & EMAGGED)
+					user.nutrition = 0 //yeah you pretty hongry
+					to_chat(user, "<span class='userdanger'>Your body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor.</span>")
+			if(fuel <= 0)
+				dat += "<br>You ran out of fuel, and drift, slowly, into a star."
+				if(obj_flags & EMAGGED)
+					var/mob/living/M = user
+					M.adjust_fire_stacks(5)
+					M.IgniteMob() //flew into a star, so you're on fire
+					to_chat(user, "<span class='userdanger'>You feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames.</span>")
+
+		if(obj_flags & EMAGGED)
+			to_chat(user, "<span class='userdanger'>You're never going to make it to Orion...</span>")
+			user.death()
+			obj_flags &= ~EMAGGED //removes the emagged status after you lose
+			gameStatus = ORION_STATUS_START
+			name = "The Orion Trail"
+			desc = "Learn how our ancestors got to Orion, and have fun in the process!"
+
+		dat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];menu=1'>May They Rest In Peace</a></P>"
+	else if(event)
+		dat = eventdat
+	else if(gameStatus == ORION_STATUS_NORMAL)
+		var/title = stops[turns]
+		var/subtext = stopblurbs[turns]
+		dat = "<center><h1>[title]</h1></center>"
+		dat += "[subtext]"
+		dat += "<h3><b>Crew:</b></h3>"
+		dat += english_list(settlers)
+		dat += "<br><b>Food: </b>[food] | <b>Fuel: </b>[fuel]"
+		dat += "<br><b>Engine Parts: </b>[engine] | <b>Hull Panels: </b>[hull] | <b>Electronics: </b>[electronics]"
+		if(turns == 7)
+			dat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];pastblack=1'>Go Around</a> <a href='byond://?src=[REF(src)];blackhole=1'>Continue</a></P>"
+		else
+			dat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];continue=1'>Continue</a></P>"
+		dat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];killcrew=1'>Kill a Crewmember</a></P>"
+		dat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];close=1'>Close</a></P>"
+	else
+		dat = "<center><h2>The Orion Trail</h2></center>"
+		dat += "<br><center><h3>Experience the journey of your ancestors!</h3></center><br><br>"
+		dat += "<center><b><a href='byond://?src=[REF(src)];newgame=1'>New Game</a></b></center>"
+		dat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];close=1'>Close</a></P>"
+	var/datum/browser/popup = new(user, "arcade", "The Orion Trail",400,700)
+	popup.set_content(dat)
+	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
+	popup.open()
+	return
+
+/obj/machinery/computer/arcade/orion_trail/Topic(href, href_list)
+	if(..())
+		return
+	if(href_list["close"])
+		usr.unset_machine()
+		usr << browse(null, "window=arcade")
+
+	if(busy)
+		return
+	busy = TRUE
+
+	if (href_list["continue"]) //Continue your travels
+		if(gameStatus == ORION_STATUS_NORMAL && !event && turns != 7)
+			if(turns >= ORION_TRAIL_WINTURN)
+				win(usr)
+			else
+				food -= (alive+lings_aboard)*2
+				fuel -= 5
+				if(turns == 2 && prob(30))
+					event = ORION_TRAIL_COLLISION
+					event()
+				else if(prob(75))
+					event = pickweight(events)
+					if(lings_aboard)
+						if(event == ORION_TRAIL_LING || prob(55))
+							event = ORION_TRAIL_LING_ATTACK
+					event()
+				turns += 1
+			if(obj_flags & EMAGGED)
+				var/mob/living/carbon/M = usr //for some vars
+				switch(event)
+					if(ORION_TRAIL_RAIDERS)
+						if(prob(50))
+							to_chat(usr, "<span class='userdanger'>You hear battle shouts. The tramping of boots on cold metal. Screams of agony. The rush of venting air. Are you going insane?</span>")
+							M.hallucination += 30
+						else
+							to_chat(usr, "<span class='userdanger'>Something strikes you from behind! It hurts like hell and feel like a blunt weapon, but nothing is there...</span>")
+							M.take_bodypart_damage(30)
+							playsound(loc, 'sound/weapons/genhit2.ogg', 100, 1)
+					if(ORION_TRAIL_ILLNESS)
+						var/severity = rand(1,3) //pray to RNGesus. PRAY, PIGS
+						if(severity == 1)
+							to_chat(M, "<span class='userdanger'>You suddenly feel slightly nauseated.</span>" )
+						if(severity == 2)
+							to_chat(usr, "<span class='userdanger'>You suddenly feel extremely nauseated and hunch over until it passes.</span>")
+							M.Stun(60)
+						if(severity >= 3) //you didn't pray hard enough
+							to_chat(M, "<span class='warning'>An overpowering wave of nausea consumes over you. You hunch over, your stomach's contents preparing for a spectacular exit.</span>")
+							M.Stun(100)
+							sleep(30)
+							M.vomit(10, distance = 5)
+					if(ORION_TRAIL_FLUX)
+						if(prob(75))
+							M.Knockdown(60)
+							say("A sudden gust of powerful wind slams [M] into the floor!")
+							M.take_bodypart_damage(25)
+							playsound(loc, 'sound/weapons/genhit.ogg', 100, 1)
+						else
+							to_chat(M, "<span class='userdanger'>A violent gale blows past you, and you barely manage to stay standing!</span>")
+					if(ORION_TRAIL_COLLISION) //by far the most damaging event
+						if(prob(90))
+							playsound(loc, 'sound/effects/bang.ogg', 100, 1)
+							var/turf/open/floor/F
+							for(F in orange(1, src))
+								F.ScrapeAway()
+							say("Something slams into the floor around [src], exposing it to space!")
+							if(hull)
+								sleep(10)
+								say("A new floor suddenly appears around [src]. What the hell?")
+								playsound(loc, 'sound/weapons/genhit.ogg', 100, 1)
+								var/turf/open/space/T
+								for(T in orange(1, src))
+									T.PlaceOnTop(/turf/open/floor/plating)
+						else
+							say("Something slams into the floor around [src] - luckily, it didn't get through!")
+							playsound(loc, 'sound/effects/bang.ogg', 50, 1)
+					if(ORION_TRAIL_MALFUNCTION)
+						playsound(loc, 'sound/effects/empulse.ogg', 50, 1)
+						visible_message("<span class='danger'>[src] malfunctions, randomizing in-game stats!</span>")
+						var/oldfood = food
+						var/oldfuel = fuel
+						food = rand(10,80) / rand(1,2)
+						fuel = rand(10,60) / rand(1,2)
+						if(electronics)
+							sleep(10)
+							if(oldfuel > fuel && oldfood > food)
+								audible_message("<span class='danger'>[src] lets out a somehow reassuring chime.</span>")
+							else if(oldfuel < fuel || oldfood < food)
+								audible_message("<span class='danger'>[src] lets out a somehow ominous chime.</span>")
+							food = oldfood
+							fuel = oldfuel
+							playsound(loc, 'sound/machines/chime.ogg', 50, 1)
+
+	else if(href_list["newgame"]) //Reset everything
+		if(gameStatus == ORION_STATUS_START)
+			newgame()
+	else if(href_list["menu"]) //back to the main menu
+		if(gameStatus == ORION_STATUS_GAMEOVER)
+			gameStatus = ORION_STATUS_START
+			event = null
+			food = 80
+			fuel = 60
+			settlers = list("Harry","Larry","Bob")
+	else if(href_list["slow"]) //slow down
+		if(event == ORION_TRAIL_FLUX)
+			food -= (alive+lings_aboard)*2
+			fuel -= 5
+		event = null
+	else if(href_list["pastblack"]) //slow down
+		if(turns == 7)
+			food -= ((alive+lings_aboard)*2)*3
+			fuel -= 15
+			turns += 1
+			event = null
+	else if(href_list["useengine"]) //use parts
+		if(event == ORION_TRAIL_BREAKDOWN)
+			engine = max(0, --engine)
+			event = null
+	else if(href_list["useelec"]) //use parts
+		if(event == ORION_TRAIL_MALFUNCTION)
+			electronics = max(0, --electronics)
+			event = null
+	else if(href_list["usehull"]) //use parts
+		if(event == ORION_TRAIL_COLLISION)
+			hull = max(0, --hull)
+			event = null
+	else if(href_list["wait"]) //wait 3 days
+		if(event == ORION_TRAIL_BREAKDOWN || event == ORION_TRAIL_MALFUNCTION || event == ORION_TRAIL_COLLISION)
+			food -= ((alive+lings_aboard)*2)*3
+			event = null
+	else if(href_list["keepspeed"]) //keep speed
+		if(event == ORION_TRAIL_FLUX)
+			if(prob(75))
+				event = "Breakdown"
+				event()
+			else
+				event = null
+	else if(href_list["blackhole"]) //keep speed past a black hole
+		if(turns == 7)
+			if(prob(75))
+				event = ORION_TRAIL_BLACKHOLE
+				event()
+				if(obj_flags & EMAGGED)
+					playsound(loc, 'sound/effects/supermatter.ogg', 100, 1)
+					say("A miniature black hole suddenly appears in front of [src], devouring [usr] alive!")
+					if(isliving(usr))
+						var/mob/living/L = usr
+						L.Stun(200, ignore_canstun = TRUE) //you can't run :^)
+					var/S = new /obj/singularity/academy(usr.loc)
+					addtimer(CALLBACK(src, /atom/movable/proc/say, "[S] winks out, just as suddenly as it appeared."), 50)
+					QDEL_IN(S, 50)
+			else
+				event = null
+				turns += 1
+	else if(href_list["holedeath"])
+		if(event == ORION_TRAIL_BLACKHOLE)
+			gameStatus = ORION_STATUS_GAMEOVER
+			event = null
+	else if(href_list["eventclose"]) //end an event
+		if(canContinueEvent)
+			event = null
+
+	else if(href_list["killcrew"]) //shoot a crewmember
+		if(gameStatus == ORION_STATUS_NORMAL || event == ORION_TRAIL_LING)
+			var/sheriff = remove_crewmember() //I shot the sheriff
+			playsound(loc,'sound/weapons/gunshot.ogg', 100, 1)
+
+			if(settlers.len == 0 || alive == 0)
+				say("The last crewmember [sheriff], shot themselves, GAME OVER!")
+				if(obj_flags & EMAGGED)
+					usr.death(0)
+					obj_flags &= EMAGGED
+				gameStatus = ORION_STATUS_GAMEOVER
+				event = null
+			else if(obj_flags & EMAGGED)
+				if(usr.name == sheriff)
+					say("The crew of the ship chose to kill [usr.name]!")
+					usr.death(0)
+
+			if(event == ORION_TRAIL_LING) //only ends the ORION_TRAIL_LING event, since you can do this action in multiple places
+				event = null
+
+	//Spaceport specific interactions
+	//they get a header because most of them don't reset event (because it's a shop, you leave when you want to)
+	//they also call event() again, to regen the eventdata, which is kind of odd but necessary
+	else if(href_list["buycrew"]) //buy a crewmember
+		if(gameStatus == ORION_STATUS_MARKET)
+			if(!spaceport_raided && food >= 10 && fuel >= 10)
+				var/bought = add_crewmember()
+				last_spaceport_action = "You hired [bought] as a new crewmember."
+				fuel -= 10
+				food -= 10
+				event()
+
+	else if(href_list["sellcrew"]) //sell a crewmember
+		if(gameStatus == ORION_STATUS_MARKET)
+			if(!spaceport_raided && settlers.len > 1)
+				var/sold = remove_crewmember()
+				last_spaceport_action = "You sold your crewmember, [sold]!"
+				fuel += 7
+				food += 7
+				event()
+
+	else if(href_list["leave_spaceport"])
+		if(gameStatus == ORION_STATUS_MARKET)
+			event = null
+			gameStatus = ORION_STATUS_NORMAL
+			spaceport_raided = 0
+			spaceport_freebie = 0
+			last_spaceport_action = ""
+
+	else if(href_list["raid_spaceport"])
+		if(gameStatus == ORION_STATUS_MARKET)
+			if(!spaceport_raided)
+				var/success = min(15 * alive,100) //default crew (4) have a 60% chance
+				spaceport_raided = 1
+
+				var/FU = 0
+				var/FO = 0
+				if(prob(success))
+					FU = rand(5,15)
+					FO = rand(5,15)
+					last_spaceport_action = "You successfully raided the spaceport! You gained [FU] Fuel and [FO] Food! (+[FU]FU,+[FO]FO)"
+				else
+					FU = rand(-5,-15)
+					FO = rand(-5,-15)
+					last_spaceport_action = "You failed to raid the spaceport! You lost [FU*-1] Fuel and [FO*-1] Food in your scramble to escape! ([FU]FU,[FO]FO)"
+
+					//your chance of lose a crewmember is 1/2 your chance of success
+					//this makes higher % failures hurt more, don't get cocky space cowboy!
+					if(prob(success*5))
+						var/lost_crew = remove_crewmember()
+						last_spaceport_action = "You failed to raid the spaceport! You lost [FU*-1] Fuel and [FO*-1] Food, AND [lost_crew] in your scramble to escape! ([FU]FI,[FO]FO,-Crew)"
+						if(obj_flags & EMAGGED)
+							say("WEEWOO! WEEWOO! Spaceport security en route!")
+							playsound(src, 'sound/items/weeoo1.ogg', 100, FALSE)
+							for(var/i, i<=3, i++)
+								var/mob/living/simple_animal/hostile/syndicate/ranged/smg/orion/O = new/mob/living/simple_animal/hostile/syndicate/ranged/smg/orion(get_turf(src))
+								O.target = usr
+
+
+				fuel += FU
+				food += FO
+				event()
+
+	else if(href_list["buyparts"])
+		if(gameStatus == ORION_STATUS_MARKET)
+			if(!spaceport_raided && fuel > 5)
+				switch(text2num(href_list["buyparts"]))
+					if(1) //Engine Parts
+						engine++
+						last_spaceport_action = "Bought Engine Parts"
+					if(2) //Hull Plates
+						hull++
+						last_spaceport_action = "Bought Hull Plates"
+					if(3) //Spare Electronics
+						electronics++
+						last_spaceport_action = "Bought Spare Electronics"
+				fuel -= 5 //they all cost 5
+				event()
+
+	else if(href_list["trade"])
+		if(gameStatus == ORION_STATUS_MARKET)
+			if(!spaceport_raided)
+				switch(text2num(href_list["trade"]))
+					if(1) //Fuel
+						if(fuel > 5)
+							fuel -= 5
+							food += 5
+							last_spaceport_action = "Traded Fuel for Food"
+							event()
+					if(2) //Food
+						if(food > 5)
+							fuel += 5
+							food -= 5
+							last_spaceport_action = "Traded Food for Fuel"
+							event()
+
+	add_fingerprint(usr)
+	updateUsrDialog()
+	busy = FALSE
+	return
+
+
+/obj/machinery/computer/arcade/orion_trail/proc/event()
+	eventdat = "<center><h1>[event]</h1></center>"
+	canContinueEvent = 0
+	switch(event)
+		if(ORION_TRAIL_RAIDERS)
+			eventdat += "Raiders have come aboard your ship!"
+			if(prob(50))
+				var/sfood = rand(1,10)
+				var/sfuel = rand(1,10)
+				food -= sfood
+				fuel -= sfuel
+				eventdat += "<br>They have stolen [sfood] <b>Food</b> and [sfuel] <b>Fuel</b>."
+			else if(prob(10))
+				var/deadname = remove_crewmember()
+				eventdat += "<br>[deadname] tried to fight back, but was killed."
+			else
+				eventdat += "<br>Fortunately, you fended them off without any trouble."
+			eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];eventclose=1'>Continue</a></P>"
+			eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];close=1'>Close</a></P>"
+			canContinueEvent = 1
+
+		if(ORION_TRAIL_FLUX)
+			eventdat += "This region of space is highly turbulent. <br>If we go slowly we may avoid more damage, but if we keep our speed we won't waste supplies."
+			eventdat += "<br>What will you do?"
+			eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];slow=1'>Slow Down</a> <a href='byond://?src=[REF(src)];keepspeed=1'>Continue</a></P>"
+			eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];close=1'>Close</a></P>"
+
+		if(ORION_TRAIL_ILLNESS)
+			eventdat += "A deadly illness has been contracted!"
+			var/deadname = remove_crewmember()
+			eventdat += "<br>[deadname] was killed by the disease."
+			eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];eventclose=1'>Continue</a></P>"
+			eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];close=1'>Close</a></P>"
+			canContinueEvent = 1
+
+		if(ORION_TRAIL_BREAKDOWN)
+			eventdat += "Oh no! The engine has broken down!"
+			eventdat += "<br>You can repair it with an engine part, or you can make repairs for 3 days."
+			if(engine >= 1)
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];useengine=1'>Use Part</a><a href='byond://?src=[REF(src)];wait=1'>Wait</a></P>"
+			else
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];wait=1'>Wait</a></P>"
+			eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];close=1'>Close</a></P>"
+
+		if(ORION_TRAIL_MALFUNCTION)
+			eventdat += "The ship's systems are malfunctioning!"
+			eventdat += "<br>You can replace the broken electronics with spares, or you can spend 3 days troubleshooting the AI."
+			if(electronics >= 1)
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];useelec=1'>Use Part</a><a href='byond://?src=[REF(src)];wait=1'>Wait</a></P>"
+			else
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];wait=1'>Wait</a></P>"
+			eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];close=1'>Close</a></P>"
+
+		if(ORION_TRAIL_COLLISION)
+			eventdat += "Something hit us! Looks like there's some hull damage."
+			if(prob(25))
+				var/sfood = rand(5,15)
+				var/sfuel = rand(5,15)
+				food -= sfood
+				fuel -= sfuel
+				eventdat += "<br>[sfood] <b>Food</b> and [sfuel] <b>Fuel</b> was vented out into space."
+			if(prob(10))
+				var/deadname = remove_crewmember()
+				eventdat += "<br>[deadname] was killed by rapid depressurization."
+			eventdat += "<br>You can repair the damage with hull plates, or you can spend the next 3 days welding scrap together."
+			if(hull >= 1)
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];usehull=1'>Use Part</a><a href='byond://?src=[REF(src)];wait=1'>Wait</a></P>"
+			else
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];wait=1'>Wait</a></P>"
+			eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];close=1'>Close</a></P>"
+
+		if(ORION_TRAIL_BLACKHOLE)
+			eventdat += "You were swept away into the black hole."
+			eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];holedeath=1'>Oh...</a></P>"
+			eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];close=1'>Close</a></P>"
+			settlers = list()
+
+		if(ORION_TRAIL_LING)
+			eventdat += "Strange reports warn of changelings infiltrating crews on trips to Orion..."
+			if(settlers.len <= 2)
+				eventdat += "<br>Your crew's chance of reaching Orion is so slim the changelings likely avoided your ship..."
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];eventclose=1'>Continue</a></P>"
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];close=1'>Close</a></P>"
+				if(prob(10)) // "likely", I didn't say it was guaranteed!
+					lings_aboard = min(++lings_aboard,2)
+			else
+				if(lings_aboard) //less likely to stack lings
+					if(prob(20))
+						lings_aboard = min(++lings_aboard,2)
+				else if(prob(70))
+					lings_aboard = min(++lings_aboard,2)
+
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];killcrew=1'>Kill a Crewmember</a></P>"
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];eventclose=1'>Risk it</a></P>"
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];close=1'>Close</a></P>"
+			canContinueEvent = 1
+
+		if(ORION_TRAIL_LING_ATTACK)
+			if(lings_aboard <= 0) //shouldn't trigger, but hey.
+				eventdat += "Haha, fooled you, there are no changelings on board!"
+				eventdat += "<br>(You should report this to a coder :S)"
+			else
+				var/ling1 = remove_crewmember()
+				var/ling2 = ""
+				if(lings_aboard >= 2)
+					ling2 = remove_crewmember()
+
+				eventdat += "Changelings among your crew suddenly burst from hiding and attack!"
+				if(ling2)
+					eventdat += "<br>[ling1] and [ling2]'s arms twist and contort into grotesque blades!"
+				else
+					eventdat += "<br>[ling1]'s arm twists and contorts into a grotesque blade!"
+
+				var/chance2attack = alive*20
+				if(prob(chance2attack))
+					var/chancetokill = 30*lings_aboard-(5*alive) //eg: 30*2-(10) = 50%, 2 lings, 2 crew is 50% chance
+					if(prob(chancetokill))
+						var/deadguy = remove_crewmember()
+						var/murder_text = pick("The changeling[ling2 ? "s" : ""] bring[ling2 ? "" : "s"] down [deadguy] and disembowel[ling2 ? "" : "s"] them in a spray of gore!", \
+						"[ling2 ? pick(ling1, ling2) : ling1] corners [deadguy] and impales them through the stomach!", \
+						"[ling2 ? pick(ling1, ling2) : ling1] decapitates [deadguy] in a single cleaving arc!")
+						eventdat += "<br>[murder_text]"
+					else
+						eventdat += "<br><br><b>You valiantly fight off the changeling[ling2 ? "s":""]!</b>"
+						if(ling2)
+							food += 30
+							lings_aboard = max(0,lings_aboard-2)
+						else
+							food += 15
+							lings_aboard = max(0,--lings_aboard)
+						eventdat += "<br><i>Well, it's perfectly good food...</i>\
+						<br>You cut the changeling[ling2 ? "s" : ""] into meat, gaining <b>[ling2 ? "30" : "15"]</b> Food!"
+				else
+					eventdat += "<br><br>[pick("Sensing unfavorable odds", "After a failed attack", "Suddenly breaking nerve")], \
+					the changeling[ling2 ? "s":""] vanish[ling2 ? "" : "es"] into space through the airlocks! You're safe... for now."
+					if(ling2)
+						lings_aboard = max(0,lings_aboard-2)
+					else
+						lings_aboard = max(0,--lings_aboard)
+
+			eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];eventclose=1'>Continue</a></P>"
+			eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];close=1'>Close</a></P>"
+			canContinueEvent = 1
+
+
+		if(ORION_TRAIL_SPACEPORT)
+			gameStatus = ORION_STATUS_MARKET
+			if(spaceport_raided)
+				eventdat += "The spaceport is on high alert! You've been barred from docking by the local authorities after your failed raid."
+				if(last_spaceport_action)
+					eventdat += "<br><b>Last Spaceport Action:</b> [last_spaceport_action]"
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];leave_spaceport=1'>Depart Spaceport</a></P>"
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];close=1'>Close</a></P>"
+			else
+				eventdat += "Your jump into the sector yields a spaceport - a lucky find!"
+				eventdat += "<br>This spaceport is home to travellers who failed to reach Orion, but managed to find a different home..."
+				eventdat += "<br>Trading terms: FU = Fuel, FO = Food"
+				if(last_spaceport_action)
+					eventdat += "<br><b>Last action:</b> [last_spaceport_action]"
+				eventdat += "<h3><b>Crew:</b></h3>"
+				eventdat += english_list(settlers)
+				eventdat += "<br><b>Food: </b>[food] | <b>Fuel: </b>[fuel]"
+				eventdat += "<br><b>Engine Parts: </b>[engine] | <b>Hull Panels: </b>[hull] | <b>Electronics: </b>[electronics]"
+
+
+				//If your crew is pathetic you can get freebies (provided you haven't already gotten one from this port)
+				if(!spaceport_freebie && (fuel < 20 || food < 20))
+					spaceport_freebie++
+					var/FU = 10
+					var/FO = 10
+					var/freecrew = 0
+					if(prob(30))
+						FU = 25
+						FO = 25
+
+					if(prob(10))
+						add_crewmember()
+						freecrew++
+
+					eventdat += "<br>The traders of the spaceport take pity on you, and generously give you some free supplies! (+[FU]FU, +[FO]FO)"
+					if(freecrew)
+						eventdat += "<br>You also gain a new crewmember!"
+
+					fuel += FU
+					food += FO
+
+				//CREW INTERACTIONS
+				eventdat += "<P ALIGN=Right>Crew Management:</P>"
+
+				//Buy crew
+				if(food >= 10 && fuel >= 10)
+					eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];buycrew=1'>Hire a New Crewmember (-10FU, -10FO)</a></P>"
+				else
+					eventdat += "<P ALIGN=Right>You cannot afford a new crewmember.</P>"
+
+				//Sell crew
+				if(settlers.len > 1)
+					eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];sellcrew=1'>Sell Crew for Fuel and Food (+7FU, +7FO)</a></P>"
+				else
+					eventdat += "<P ALIGN=Right>You have no other crew to sell.</P>"
+
+				//BUY/SELL STUFF
+				eventdat += "<P ALIGN=Right>Spare Parts:</P>"
+
+				//Engine parts
+				if(fuel > 5)
+					eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];buyparts=1'>Buy Engine Parts (-5FU)</a></P>"
+				else
+					eventdat += "<P ALIGN=Right>You cannot afford engine parts.</a>"
+
+				//Hull plates
+				if(fuel > 5)
+					eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];buyparts=2'>Buy Hull Plates (-5FU)</a></P>"
+				else
+					eventdat += "<P ALIGN=Right>You cannot afford hull plates.</a>"
+
+				//Electronics
+				if(fuel > 5)
+					eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];buyparts=3'>Buy Spare Electronics (-5FU)</a></P>"
+				else
+					eventdat += "<P ALIGN=Right>You cannot afford spare electronics.</a>"
+
+				//Trade
+				if(fuel > 5)
+					eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];trade=1'>Trade Fuel for Food (-5FU,+5FO)</a></P>"
+				else
+					eventdat += "<P ALIGN=Right>You don't have 5FU to trade.</P"
+
+				if(food > 5)
+					eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];trade=2'>Trade Food for Fuel (+5FU,-5FO)</a></P>"
+				else
+					eventdat += "<P ALIGN=Right>You don't have 5FO to trade.</P"
+
+				//Raid the spaceport
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];raid_spaceport=1'>!! Raid Spaceport !!</a></P>"
+
+				eventdat += "<P ALIGN=Right><a href='byond://?src=[REF(src)];leave_spaceport=1'>Depart Spaceport</a></P>"
+
+
+//Add Random/Specific crewmember
+/obj/machinery/computer/arcade/orion_trail/proc/add_crewmember(var/specific = "")
+	var/newcrew = ""
+	if(specific)
+		newcrew = specific
+	else
+		if(prob(50))
+			newcrew = pick(GLOB.first_names_male)
+		else
+			newcrew = pick(GLOB.first_names_female)
+	if(newcrew)
+		settlers += newcrew
+		alive++
+	return newcrew
+
+
+//Remove Random/Specific crewmember
+/obj/machinery/computer/arcade/orion_trail/proc/remove_crewmember(var/specific = "", var/dont_remove = "")
+	var/list/safe2remove = settlers
+	var/removed = ""
+	if(dont_remove)
+		safe2remove -= dont_remove
+	if(specific && specific != dont_remove)
+		safe2remove = list(specific)
+	else
+		removed = pick(safe2remove)
+
+	if(removed)
+		if(lings_aboard && prob(40*lings_aboard)) //if there are 2 lings you're twice as likely to get one, obviously
+			lings_aboard = max(0,--lings_aboard)
+		settlers -= removed
+		alive--
+	return removed
+
+
+/obj/machinery/computer/arcade/orion_trail/proc/win(mob/user)
+	gameStatus = ORION_STATUS_START
+	say("Congratulations, you made it to Orion!")
+	if(obj_flags & EMAGGED)
+		new /obj/item/orion_ship(loc)
+		message_admins("[ADMIN_LOOKUPFLW(usr)] made it to Orion on an emagged machine and got an explosive toy ship.")
+		log_game("[key_name(usr)] made it to Orion on an emagged machine and got an explosive toy ship.")
+	else
+		prizevend(user)
+	obj_flags &= ~EMAGGED
+	name = "The Orion Trail"
+	desc = "Learn how our ancestors got to Orion, and have fun in the process!"
+
+/obj/machinery/computer/arcade/orion_trail/emag_act(mob/user)
+	if(obj_flags & EMAGGED)
+		return
+	to_chat(user, "<span class='notice'>You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode.</span>")
+	name = "The Orion Trail: Realism Edition"
+	desc = "Learn how our ancestors got to Orion, and try not to die in the process!"
+	newgame()
+	obj_flags |= EMAGGED
+
+/mob/living/simple_animal/hostile/syndicate/ranged/smg/orion
+	name = "spaceport security"
+	desc = "Premier corporate security forces for all spaceports found along the Orion Trail."
+	faction = list("orion")
+	loot = list()
+	del_on_death = TRUE
+
+/obj/item/orion_ship
+	name = "model settler ship"
+	desc = "A model spaceship, it looks like those used back in the day when travelling to Orion! It even has a miniature FX-293 reactor, which was renowned for its instability and tendency to explode..."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "ship"
+	w_class = WEIGHT_CLASS_SMALL
+	var/active = 0 //if the ship is on
+
+/obj/item/orion_ship/examine(mob/user)
+	..()
+	if(!(in_range(user, src)))
+		return
+	if(!active)
+		to_chat(user, "<span class='notice'>There's a little switch on the bottom. It's flipped down.</span>")
+	else
+		to_chat(user, "<span class='notice'>There's a little switch on the bottom. It's flipped up.</span>")
+
+/obj/item/orion_ship/attack_self(mob/user) //Minibomb-level explosion. Should probably be more because of how hard it is to survive the machine! Also, just over a 5-second fuse
+	if(active)
+		return
+
+	message_admins("[ADMIN_LOOKUPFLW(usr)] primed an explosive Orion ship for detonation at [AREACOORD(usr)].")
+	log_game("[key_name(usr)] primed an explosive Orion ship for detonation at [AREACOORD(usr)].")
+
+	to_chat(user, "<span class='warning'>You flip the switch on the underside of [src].</span>")
+	active = 1
+	visible_message("<span class='notice'>[src] softly beeps and whirs to life!</span>")
+	playsound(loc, 'sound/machines/defib_SaftyOn.ogg', 25, 1)
+	say("This is ship ID #[rand(1,1000)] to Orion Port Authority. We're coming in for landing, over.")
+	sleep(20)
+	visible_message("<span class='warning'>[src] begins to vibrate...</span>")
+	say("Uh, Port? Having some issues with our reactor, could you check it out? Over.")
+	sleep(30)
+	say("Oh, God! Code Eight! CODE EIGHT! IT'S GONNA BL-")
+	playsound(loc, 'sound/machines/buzz-sigh.ogg', 25, 1)
+	sleep(3.6)
+	visible_message("<span class='userdanger'>[src] explodes!</span>")
+	explosion(loc, 2,4,8, flame_range = 16)
+	qdel(src)
+
+#undef ORION_TRAIL_WINTURN
+#undef ORION_TRAIL_RAIDERS
+#undef ORION_TRAIL_FLUX
+#undef ORION_TRAIL_ILLNESS
+#undef ORION_TRAIL_BREAKDOWN
+#undef ORION_TRAIL_LING
+#undef ORION_TRAIL_LING_ATTACK
+#undef ORION_TRAIL_MALFUNCTION
+#undef ORION_TRAIL_COLLISION
+#undef ORION_TRAIL_SPACEPORT
+#undef ORION_TRAIL_BLACKHOLE
+
+#undef ORION_STATUS_START
+#undef ORION_STATUS_NORMAL
+#undef ORION_STATUS_GAMEOVER
+#undef ORION_STATUS_MARKET

code/game/objects/effects/spawners/lootdrop.dm

@@ -214,6 +214,20 @@
 				/obj/item/aiModule/core/full/damaged
 				)
 
+/obj/effect/spawner/lootdrop/mre
+	name = "random MRE"
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "mre"
+
+/obj/effect/spawner/lootdrop/mre/Initialize()
+	for(var/A in subtypesof(/obj/item/storage/box/mre))
+		var/obj/item/storage/box/mre/M = A
+		var/our_chance = initial(M.spawner_chance)
+		if(our_chance)
+			LAZYSET(loot, M, our_chance)
+	return ..()
+
+
 // Tech storage circuit board spawners
 // For these, make sure that lootcount equals the number of list items
 

code/game/objects/items.dm

@@ -686,7 +686,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 		..()
 
 /obj/item/proc/microwave_act(obj/machinery/microwave/M)
-	if(M && M.dirty < 100)
+	if(istype(M) && M.dirty < 100)
 		M.dirty++
 
 /obj/item/proc/on_mob_death(mob/living/L, gibbed)

code/game/objects/items/cigs_lighters.dm

@@ -707,9 +707,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	item_state = null
 	w_class = WEIGHT_CLASS_TINY
 	var/chem_volume = 100
-	var/vapetime = 0 //this so it won't puff out clouds every tick
-	var/screw = 0 // kinky
-	var/super = 0 //for the fattest vapes dude.
+	var/vapetime = FALSE //this so it won't puff out clouds every tick
+	var/screw = FALSE // kinky
+	var/super = FALSE //for the fattest vapes dude.
 
 /obj/item/clothing/mask/vape/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is puffin hard on dat vape, [user.p_they()] trying to join the vape life on a whole notha plane!</span>")//it doesn't give you cancer, it is cancer
@@ -718,7 +718,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 
 /obj/item/clothing/mask/vape/Initialize(mapload, param_color)
 	. = ..()
-	DISABLE_BITFIELD(reagents.reagents_holder_flags, NO_REACT)
+	create_reagents(chem_volume, NO_REACT) // so it doesn't react until you light it
 	reagents.add_reagent("nicotine", 50)
 	if(!icon_state)
 		if(!param_color)
@@ -727,52 +727,48 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		item_state = "[param_color]_vape"
 
 /obj/item/clothing/mask/vape/attackby(obj/item/O, mob/user, params)
-	if(O.is_drainable())
-		if(reagents.total_volume < chem_volume)
-			if(O.reagents.total_volume > 0)
-				O.reagents.trans_to(src,25)
-				to_chat(user, "<span class='notice'>You add the contents of [O] to [src].</span>")
-			else
-				to_chat(user, "<span class='warning'>[O] is empty!</span>")
-		else
-			to_chat(user, "<span class='warning'>[src] can't hold anymore reagents!</span>")
-
-	if(istype(O, /obj/item/screwdriver))
+	if(O.tool_behaviour == TOOL_SCREWDRIVER)
 		if(!screw)
-			screw = 1
+			screw = TRUE
 			to_chat(user, "<span class='notice'>You open the cap on [src].</span>")
-			if(super)
+			ENABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER)
+			if(obj_flags & EMAGGED)
+				add_overlay("vapeopen_high")
+			else if(super)
 				add_overlay("vapeopen_med")
 			else
 				add_overlay("vapeopen_low")
 		else
-			screw = 0
+			screw = FALSE
 			to_chat(user, "<span class='notice'>You close the cap on [src].</span>")
+			DISABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER)
 			cut_overlays()
 
-	if(istype(O, /obj/item/multitool))
+	if(O.tool_behaviour == TOOL_MULTITOOL)
 		if(screw && !(obj_flags & EMAGGED))//also kinky
 			if(!super)
 				cut_overlays()
-				super = 1
+				super = TRUE
 				to_chat(user, "<span class='notice'>You increase the voltage of [src].</span>")
 				add_overlay("vapeopen_med")
 			else
 				cut_overlays()
-				super = 0
+				super = FALSE
 				to_chat(user, "<span class='notice'>You decrease the voltage of [src].</span>")
 				add_overlay("vapeopen_low")
 
 		if(screw && (obj_flags & EMAGGED))
 			to_chat(user, "<span class='notice'>[src] can't be modified!</span>")
 
+		else
+			..()
 
 /obj/item/clothing/mask/vape/emag_act(mob/user)// I WON'T REGRET WRITTING THIS, SURLY.
 	if(screw)
 		if(!(obj_flags & EMAGGED))
 			cut_overlays()
 			obj_flags |= EMAGGED
-			super = 0
+			super = FALSE
 			to_chat(user, "<span class='warning'>You maximize the voltage of [src].</span>")
 			add_overlay("vapeopen_high")
 			var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread //for effect

code/game/objects/items/circuitboards/computer_circuitboards.dm

@@ -123,6 +123,14 @@
 	name = "Orion Trail (Computer Board)"
 	build_path = /obj/machinery/computer/arcade/orion_trail
 
+/obj/item/circuitboard/computer/arcade/minesweeper
+	name = "Minesweeper (Computer Board)"
+	build_path = /obj/machinery/computer/arcade/minesweeper
+
+/obj/item/circuitboard/computer/arcade/amputation
+	name = "Mediborg's Amputation Adventure (Computer Board)"
+	build_path = /obj/machinery/computer/arcade/amputation
+
 /obj/item/circuitboard/computer/turbine_control
 	name = "Turbine control (Computer Board)"
 	build_path = /obj/machinery/computer/turbine_computer

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

@@ -10,6 +10,15 @@ GLOBAL_LIST_EMPTY(PDAs)
 #define PDA_SCANNER_HALOGEN		4
 #define PDA_SCANNER_GAS			5
 #define PDA_SPAM_DELAY		    2 MINUTES
+#define PDA_STANDARD_OVERLAYS list("pda-r", "blank", "id_overlay", "insert_overlay", "light_overlay", "pai_overlay")
+
+//pda icon overlays list defines
+#define PDA_OVERLAY_ALERT		1
+#define PDA_OVERLAY_SCREEN		2
+#define PDA_OVERLAY_ID			3
+#define PDA_OVERLAY_ITEM		4
+#define PDA_OVERLAY_LIGHT		5
+#define PDA_OVERLAY_PAI			6
 
 /obj/item/pda
 	name = "\improper PDA"
@@ -31,7 +40,8 @@ GLOBAL_LIST_EMPTY(PDAs)
 	var/default_cartridge = 0 // Access level defined by cartridge
 	var/obj/item/cartridge/cartridge = null //current cartridge
 	var/mode = 0 //Controls what menu the PDA will display. 0 is hub; the rest are either built in or based on cartridge.
-	var/icon_alert = "pda-r" //Icon to be overlayed for message alerts. Taken from the pda icon file.
+	var/list/overlays_icons = list('icons/obj/pda_alt.dmi' = list("pda-r", "screen_default", "id_overlay", "insert_overlay", "light_overlay", "pai_overlay"))
+	var/current_overlays = PDA_STANDARD_OVERLAYS
 	var/font_index = 0 //This int tells DM which font is currently selected and lets DM know when the last font has been selected so that it can cycle back to the first font when "toggle font" is pressed again.
 	var/font_mode = "font-family:monospace;" //The currently selected font.
 	var/background_color = "#808000" //The currently selected background color.
@@ -78,7 +88,9 @@ GLOBAL_LIST_EMPTY(PDAs)
 
 	var/list/contained_item = list(/obj/item/pen, /obj/item/toy/crayon, /obj/item/lipstick, /obj/item/flashlight/pen, /obj/item/clothing/mask/cigarette)
 	var/obj/item/inserted_item //Used for pen, crayon, and lipstick insertion or removal. Same as above.
-	var/overlays_x_offset = 0	//x offset to use for certain overlays
+	var/list/overlays_offsets // offsets to use for certain overlays
+	var/overlays_x_offset = 0
+	var/overlays_y_offset = 0
 
 	var/underline_flag = TRUE //flag for underline
 
@@ -91,15 +103,13 @@ GLOBAL_LIST_EMPTY(PDAs)
 	return BRUTELOSS
 
 /obj/item/pda/examine(mob/user)
-	..()
-	if(!id && !inserted_item)
-		return
-
-	if(id)
-		to_chat(user, "<span class='notice'>Alt-click to remove the id.</span>")
-
+	. = ..()
+	var/dat = id ? "<span class='notice'>Alt-click to remove the id.</span>" : ""
 	if(inserted_item && (!isturf(loc)))
-		to_chat(user, "<span class='notice'>Ctrl-click to remove [inserted_item].</span>")
+		dat += "\n<span class='notice'>Ctrl-click to remove [inserted_item].</span>"
+	if(LAZYLEN(GLOB.pda_reskins))
+		dat += "\n<span class='notice'>Ctrl-shift-click it to reskin it.</span>"
+	to_chat(user, dat)
 
 /obj/item/pda/Initialize()
 	. = ..()
@@ -115,28 +125,71 @@ GLOBAL_LIST_EMPTY(PDAs)
 		inserted_item =	new /obj/item/pen(src)
 	update_icon()
 
+/obj/item/pda/CtrlShiftClick(mob/living/user)
+	. = ..()
+	if(GLOB.pda_reskins && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
+		reskin_obj(user)
+
+/obj/item/pda/reskin_obj(mob/M)
+	if(!LAZYLEN(GLOB.pda_reskins))
+		return
+	var/dat = "<b>Reskin options for [name]:</b>"
+	for(var/V in GLOB.pda_reskins)
+		var/output = icon2html(GLOB.pda_reskins[V], M, icon_state)
+		dat += "\n[V]: <span class='reallybig'>[output]</span>"
+	to_chat(M, dat)
+
+	var/choice = input(M, "Choose the a reskin for [src]","Reskin Object") as null|anything in GLOB.pda_reskins
+	var/new_icon = GLOB.pda_reskins[choice]
+	if(QDELETED(src) || isnull(new_icon) || new_icon == icon || M.incapacitated() || !in_range(M,src))
+		return
+	icon = new_icon
+	set_new_overlays()
+	update_icon()
+	to_chat(M, "[src] is now skinned as '[choice]'.")
+
+/obj/item/pda/proc/set_new_overlays()
+	if(!overlays_offsets || !(icon in overlays_offsets))
+		overlays_x_offset = 0
+		overlays_y_offset = 0
+	else
+		var/list/new_offsets = overlays_offsets[icon]
+		if(new_offsets)
+			overlays_x_offset = new_offsets[1]
+			overlays_y_offset = new_offsets[2]
+	if(!(icon in overlays_icons))
+		current_overlays = PDA_STANDARD_OVERLAYS
+		return
+	current_overlays = overlays_icons[icon]
+
 /obj/item/pda/equipped(mob/user, slot)
 	. = ..()
-	if(!equipped)
-		if(user.client)
-			background_color = user.client.prefs.pda_color
-			switch(user.client.prefs.pda_style)
-				if(MONO)
-					font_index = MODE_MONO
-					font_mode = FONT_MONO
-				if(SHARE)
-					font_index = MODE_SHARE
-					font_mode = FONT_SHARE
-				if(ORBITRON)
-					font_index = MODE_ORBITRON
-					font_mode = FONT_ORBITRON
-				if(VT)
-					font_index = MODE_VT
-					font_mode = FONT_VT
-				else
-					font_index = MODE_MONO
-					font_mode = FONT_MONO
-			equipped = TRUE
+	if(equipped)
+		return
+	if(user.client)
+		background_color = user.client.prefs.pda_color
+		switch(user.client.prefs.pda_style)
+			if(MONO)
+				font_index = MODE_MONO
+				font_mode = FONT_MONO
+			if(SHARE)
+				font_index = MODE_SHARE
+				font_mode = FONT_SHARE
+			if(ORBITRON)
+				font_index = MODE_ORBITRON
+				font_mode = FONT_ORBITRON
+			if(VT)
+				font_index = MODE_VT
+				font_mode = FONT_VT
+			else
+				font_index = MODE_MONO
+				font_mode = FONT_MONO
+		var/pref_skin = GLOB.pda_reskins[user.client.prefs.pda_skin]
+		if(icon != pref_skin)
+			icon = pref_skin
+			set_new_overlays()
+			update_icon()
+		equipped = TRUE
 
 /obj/item/pda/proc/update_label()
 	name = "PDA-[owner] ([ownjob])" //Name generalisation
@@ -150,26 +203,23 @@ GLOBAL_LIST_EMPTY(PDAs)
 /obj/item/pda/GetID()
 	return id
 
-/obj/item/pda/update_icon()
+/obj/item/pda/update_icon(alert = FALSE)
 	cut_overlays()
+	add_overlay(alert ? current_overlays[PDA_OVERLAY_ALERT] : current_overlays[PDA_OVERLAY_SCREEN])
 	var/mutable_appearance/overlay = new()
 	overlay.pixel_x = overlays_x_offset
 	if(id)
-		overlay.icon_state = "id_overlay"
+		overlay.icon_state = current_overlays[PDA_OVERLAY_ID]
 		add_overlay(new /mutable_appearance(overlay))
 	if(inserted_item)
-		overlay.icon_state = "insert_overlay"
+		overlay.icon_state = current_overlays[PDA_OVERLAY_ITEM]
 		add_overlay(new /mutable_appearance(overlay))
 	if(fon)
-		overlay.icon_state = "light_overlay"
+		overlay.icon_state = current_overlays[PDA_OVERLAY_LIGHT]
 		add_overlay(new /mutable_appearance(overlay))
 	if(pai)
-		if(pai.pai)
-			overlay.icon_state = "pai_overlay"
-			add_overlay(new /mutable_appearance(overlay))
-		else
-			overlay.icon_state = "pai_off_overlay"
-			add_overlay(new /mutable_appearance(overlay))
+		overlay.icon_state = "[current_overlays[PDA_OVERLAY_PAI]][pai.pai ? "" : "_off"]"
+		add_overlay(new /mutable_appearance(overlay))
 
 /obj/item/pda/MouseDrop(mob/over, src_location, over_location)
 	var/mob/M = usr
@@ -740,8 +790,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 
 		to_chat(L, "[icon2html(src)] <b>Message from [hrefstart][signal.data["name"]] ([signal.data["job"]])[hrefend], </b>[signal.format_message()] (<a href='byond://?src=[REF(src)];choice=Message;skiprefresh=1;target=[REF(signal.source)]'>Reply</a>)")
 
-	update_icon()
-	add_overlay(icon_alert)
+	update_icon(TRUE)
 
 /obj/item/pda/proc/send_to_all(mob/living/U)
 	if (last_everyone && world.time < last_everyone + PDA_SPAM_DELAY)
@@ -1080,4 +1129,11 @@ GLOBAL_LIST_EMPTY(PDAs)
 #undef PDA_SCANNER_HALOGEN
 #undef PDA_SCANNER_GAS
 #undef PDA_SPAM_DELAY
+#undef PDA_STANDARD_OVERLAYS
 
+#undef PDA_OVERLAY_ALERT
+#undef PDA_OVERLAY_SCREEN
+#undef PDA_OVERLAY_ID
+#undef PDA_OVERLAY_ITEM
+#undef PDA_OVERLAY_LIGHT
+#undef PDA_OVERLAY_PAI

code/game/objects/items/devices/PDA/PDA_types.dm

@@ -124,6 +124,16 @@
 	icon_state = "pda-captain"
 	detonatable = FALSE
 
+/obj/item/pda/lieutenant
+	name = "lieutenant PDA"
+	default_cartridge = /obj/item/cartridge/captain
+	inserted_item = /obj/item/pen/fountain/captain
+	icon_state = "pda-lieutenant"
+	ttone = "bwoink"
+	detonatable = FALSE
+	hidden = TRUE
+	note = "Congratulations, you have chosen the Thinktronic 5230-2 Personal Data Assistant Prestige Edition! To help with navigation, we have provided the following definitions. North: Fore. South: Aft. West: Port. East: Starboard. Quarter is either side of aft."
+
 /obj/item/pda/cargo
 	name = "cargo technician PDA"
 	default_cartridge = /obj/item/cartridge/quartermaster
@@ -171,25 +181,29 @@
 /obj/item/pda/curator
 	name = "curator PDA"
 	icon_state = "pda-library"
-	icon_alert = "pda-r-library"
+	overlays_icons = list('icons/obj/pda.dmi' = list("pda-r-library","blank","id_overlay","insert_overlay", "light_overlay", "pai_overlay"),
+						'icons/obj/pda_alt.dmi' = list("pda-r","screen_default","id_overlay","insert_overlay", "light_overlay", "pai_overlay"))
+	current_overlays = list("pda-r-library","blank","id_overlay","insert_overlay", "light_overlay", "pai_overlay")
 	default_cartridge = /obj/item/cartridge/curator
 	inserted_item = /obj/item/pen/fountain
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a WGW-11 series e-reader."
-	note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!"
+	note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant! To help with navigation, we have provided the following definitions. North: Fore. South: Aft. West: Port. East: Starboard. Quarter is either side of aft."
 	silent = TRUE //Quiet in the library!
+	overlays_offsets = list('icons/obj/pda.dmi' = list(-3,0))
 	overlays_x_offset = -3
 
 /obj/item/pda/clear
 	name = "clear PDA"
 	icon_state = "pda-clear"
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a special edition with a transparent case."
-	note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition!"
+	note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition! To help with navigation, we have provided the following definitions. North: Fore. South: Aft. West: Port. East: Starboard. Quarter is either side of aft."
 
 /obj/item/pda/neko
 	name = "neko PDA"
 	icon_state = "pda-neko"
-	desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a special edition a feline fine case."
-	note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Mew Turbo Limited Edition NYA~!"
+	overlays_icons = list('icons/obj/pda_alt.dmi' = list("pda-r", "screen_neko", "id_overlay", "insert_overlay", "light_overlay", "pai_overlay"))
+	desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a special feline edition."
+	note = "Congratulations, you have chosen the Thinktronic 5230 Personal Data Assistant Deluxe Special Mew Turbo Limited Edition NYA~! To help with navigation, we have provided the following definitions. North: Fore. South: Aft. West: Port. East: Starboard. Quarter is either side of aft."
 
 /obj/item/pda/cook
 	name = "cook PDA"

code/game/objects/items/holy_weapons.dm

@@ -58,7 +58,7 @@
 	item_state = "radio"
 
 /obj/item/holybeacon/attack_self(mob/user)
-	if(user.mind && (user.mind.isholy) && !SSreligion.holy_armor_type)
+	if(user.mind && (user.mind.isholy) && !GLOB.holy_armor_type)
 		beacon_armor(user)
 	else
 		playsound(src, 'sound/machines/buzz-sigh.ogg', 40, 1)
@@ -71,13 +71,13 @@
 		display_names += list(initial(A.name) = A)
 
 	var/choice = input(M,"What holy armor kit would you like to order?","Holy Armor Theme") as null|anything in display_names
-	if(QDELETED(src) || !choice || M.stat || !in_range(M, src) || M.restrained() || !M.canmove || SSreligion.holy_armor_type)
+	if(QDELETED(src) || !choice || M.stat || !in_range(M, src) || M.restrained() || !M.canmove || GLOB.holy_armor_type)
 		return
 
 	var/index = display_names.Find(choice)
 	var/A = holy_armor_list[index]
 
-	SSreligion.holy_armor_type = A
+	GLOB.holy_armor_type = A
 	var/holy_armor_box = new A
 
 	SSblackbox.record_feedback("tally", "chaplain_armor", 1, "[choice]")
@@ -245,7 +245,7 @@
 		reskin_holy_weapon(user)
 
 /obj/item/nullrod/proc/reskin_holy_weapon(mob/M)
-	if(SSreligion.holy_weapon_type)
+	if(GLOB.holy_weapon_type)
 		return
 	var/obj/item/nullrod/holy_weapon
 	var/list/holy_weapons_list = typesof(/obj/item/nullrod) + list(
@@ -264,7 +264,7 @@
 	var/A = display_names[choice] // This needs to be on a separate var as list member access is not allowed for new
 	holy_weapon = new A
 
-	SSreligion.holy_weapon_type = holy_weapon.type
+	GLOB.holy_weapon_type = holy_weapon.type
 
 	SSblackbox.record_feedback("tally", "chaplain_weapon", 1, "[choice]")
 

code/game/objects/items/stacks/stack.dm

@@ -396,7 +396,7 @@
 	//TODO bloody overlay
 
 /obj/item/stack/microwave_act(obj/machinery/microwave/M)
-	if(M && M.dirty < 100)
+	if(istype(M) && M.dirty < 100)
 		M.dirty += amount
 
 /*

code/game/objects/items/storage/belt.dm

@@ -576,6 +576,8 @@
 		/obj/item/gun/ballistic/automatic/pistol,
 		/obj/item/gun/ballistic/revolver,
 		/obj/item/ammo_box,
+		/obj/item/toy/gun,
+		/obj/item/gun/energy/e_gun/mini
 		))
 
 /obj/item/storage/belt/holster/full/PopulateContents()

code/game/objects/items/storage/book.dm

@@ -51,7 +51,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 	if(!istype(H))
 		return
 	// If H is the Chaplain, we can set the icon_state of the bible (but only once!)
-	if(!SSreligion.bible_icon_state && H.job == "Chaplain")
+	if(!GLOB.bible_icon_state && H.job == "Chaplain")
 		var/dat = "<html><head><title>Pick Bible Style</title></head><body><center><h2>Pick a bible style</h2></center><table>"
 		for(var/i in 1 to GLOB.biblestates.len)
 			var/icon/bibleicon = icon('icons/obj/storage.dmi', GLOB.biblestates[i])
@@ -64,7 +64,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 /obj/item/storage/book/bible/Topic(href, href_list)
 	if(!usr.canUseTopic(src))
 		return
-	if(href_list["seticon"] && SSreligion && !SSreligion.bible_icon_state)
+	if(href_list["seticon"] && GLOB && !GLOB.bible_icon_state)
 		var/iconi = text2num(href_list["seticon"])
 		var/biblename = GLOB.biblenames[iconi]
 		var/obj/item/storage/book/bible/B = locate(href_list["src"])
@@ -76,8 +76,8 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 			H.dna.add_mutation(CLOWNMUT)
 			H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), SLOT_WEAR_MASK)
 
-		SSreligion.bible_icon_state = B.icon_state
-		SSreligion.bible_item_state = B.item_state
+		GLOB.bible_icon_state = B.icon_state
+		GLOB.bible_item_state = B.item_state
 
 		SSblackbox.record_feedback("text", "religion_book", 1, "[biblename]")
 		usr << browse(null, "window=editicon")
@@ -89,7 +89,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 			to_chat(user, "<span class='warning'>[src.deity_name] refuses to heal this metallic taint!</span>")
 			return 0
 
-	var/heal_amt = 10
+	var/heal_amt = 5
 	var/list/hurt_limbs = H.get_damaged_bodyparts(1, 1)
 
 	if(hurt_limbs.len)
@@ -138,8 +138,8 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 			smack = 0
 		else if(iscarbon(M))
 			var/mob/living/carbon/C = M
-			if(!istype(C.head, /obj/item/clothing/head/helmet))
-				C.adjustBrainLoss(5, 60)
+			if(!istype(C.head, /obj/item/clothing/head))	
+				C.adjustBrainLoss(10, 80)
 				to_chat(C, "<span class='danger'>You feel dumber.</span>")
 
 		if(smack)

code/game/objects/items/storage/boxes.dm

@@ -1126,3 +1126,73 @@
 /obj/item/storage/box/pink
 	icon_state = "box_pink"
 	illustration = null
+
+/obj/item/storage/box/mre //base MRE type.
+	name = "Nanotrasen MRE Ration Kit Menu 0"
+	desc = "A package containing food suspended in an outdated bluespace pocket which lasts for centuries. If you're lucky you may even be able to enjoy the meal without getting food poisoning."
+	icon_state = "mre"
+	var/can_expire = TRUE
+	var/spawner_chance = 2
+	var/expiration_date
+	var/expiration_date_min = 2300
+	var/expiration_date_max = 2700
+
+/obj/item/storage/box/mre/Initialize()
+	. = ..()
+	if(can_expire)
+		expiration_date = rand(expiration_date_min, expiration_date_max)
+		desc += "\n<span_clas='notice'>An expiry date is listed on it. It reads: [expiration_date]</span>"
+		var/spess_current_year = GLOB.year_integer + 540
+		if(expiration_date < spess_current_year)
+			var/gross_risk = min(round(spess_current_year - expiration_date * 0.1), 1)
+			var/toxic_risk = min(round(spess_current_year - expiration_date * 0.01), 1)
+			for(var/obj/item/reagent_containers/food/snacks/S in contents)
+				if(prob(gross_risk))
+					ENABLE_BITFIELD(S.foodtype, GROSS)
+				if(prob(toxic_risk))
+					ENABLE_BITFIELD(S.foodtype, TOXIC)
+
+/obj/item/storage/box/mre/menu1
+	name = "\improper Nanotrasen MRE Ration Kit Menu 1"
+
+/obj/item/storage/box/mre/menu1/safe
+	desc = "A package containing food suspended in a bluespace pocket capable of lasting till the end of time."
+	spawner_chance = 0
+	can_expire = FALSE
+
+/obj/item/storage/box/mre/menu1/PopulateContents()
+	new /obj/item/reagent_containers/food/snacks/breadslice/plain(src)
+	new /obj/item/reagent_containers/food/snacks/breadslice/creamcheese(src)
+	new /obj/item/reagent_containers/food/condiment/pack/ketchup(src)
+	new /obj/item/reagent_containers/food/snacks/chocolatebar(src)
+	new /obj/item/tank/internals/emergency_oxygen(src)
+
+/obj/item/storage/box/mre/menu2
+	name = "\improper Nanotrasen MRE Ration Kit Menu 2"
+
+/obj/item/storage/box/mre/menu2/safe
+	spawner_chance = 0
+	desc = "A package containing food suspended in a bluespace pocket capable of lasting till the end of time."
+	can_expire = FALSE
+
+/obj/item/storage/box/mre/menu2/PopulateContents()
+	new /obj/item/reagent_containers/food/snacks/omelette(src)
+	new /obj/item/reagent_containers/food/snacks/meat/cutlet/plain(src)
+	new /obj/item/reagent_containers/food/snacks/fries(src)
+	new /obj/item/reagent_containers/food/snacks/chocolatebar(src)
+	new /obj/item/tank/internals/emergency_oxygen(src)
+
+/obj/item/storage/box/mre/menu3
+	name = "\improper Nanotrasen MRE Ration Kit Menu 3"
+	desc = "The holy grail of MREs. This item contains the fabled MRE pizza and a sample of coffee instant type 2. Any NT employee lucky enough to get their hands on one of these is truly blessed."
+	icon_state = "menu3"
+	can_expire = FALSE //always fresh, never expired.
+	spawner_chance = 1
+
+/obj/item/storage/box/mre/menu3/PopulateContents()
+	new /obj/item/reagent_containers/food/snacks/pizzaslice/pepperoni(src)
+	new /obj/item/reagent_containers/food/snacks/breadslice/plain(src)
+	new /obj/item/reagent_containers/food/snacks/cheesewedge(src)
+	new /obj/item/reagent_containers/food/snacks/grown/chili(src)
+	new /obj/item/reagent_containers/food/drinks/coffee/type2(src)
+	new /obj/item/tank/internals/emergency_oxygen(src)

code/game/objects/items/storage/toolbox.dm

@@ -183,9 +183,9 @@
 	slab_type = /obj/item/clockwork/slab/debug
 	fabricator_type = /obj/item/clockwork/replica_fabricator/scarab/debug
 
-/obj/item/storage/toolbox/durasteel
-	name = "durasteel toolbox"
-	desc = "A toolbox made out of durasteel. Probably packs a massive punch."
+/obj/item/storage/toolbox/plastitanium
+	name = "plastitanium toolbox"
+	desc = "A toolbox made out of plastitanium. Probably packs a massive punch."
 	total_mass = 5
 	icon_state = "blue"
 	item_state = "toolbox_blue"

code/game/objects/items/toys.dm

@@ -636,10 +636,13 @@
 	var/obj/machinery/computer/holodeck/holo = null // Holodeck cards should not be infinite
 	var/list/cards = list()
 
-/obj/item/toy/cards/deck/New()
-	..()
+/obj/item/toy/cards/deck/Initialize()
+	. = ..()
+	populate_deck()
+
+/obj/item/toy/cards/deck/proc/populate_deck()
 	icon_state = "deck_[deckstyle]_full"
-	for(var/i = 2; i <= 10; i++)
+	for(var/i in 2 to 10)
 		cards += "[i] of Hearts"
 		cards += "[i] of Spades"
 		cards += "[i] of Clubs"
@@ -664,6 +667,9 @@
 //ATTACK HAND IGNORING PARENT RETURN VALUE
 //ATTACK HAND NOT CALLING PARENT
 /obj/item/toy/cards/deck/attack_hand(mob/user)
+	draw_card(user)
+
+/obj/item/toy/cards/deck/proc/draw_card(mob/user)
 	if(user.lying)
 		return
 	var/choice = null
@@ -778,7 +784,7 @@
 /obj/item/toy/cards/cardhand/Topic(href, href_list)
 	if(..())
 		return
-	if(usr.stat || !ishuman(usr) || !usr.canmove)
+	if(usr.stat || !ishuman(usr))
 		return
 	var/mob/living/carbon/human/cardUser = usr
 	var/O = src
@@ -941,7 +947,6 @@
 	newobj.card_attack_verb = sourceobj.card_attack_verb
 	newobj.attack_verb = newobj.card_attack_verb
 
-
 /*
 || Syndicate playing cards, for pretending you're Gambit and playing poker for the nuke disk. ||
 */

code/game/objects/objs.dm

@@ -18,8 +18,9 @@
 	var/acid_level = 0 //how much acid is on that obj
 
 	var/persistence_replacement //have something WAY too amazing to live to the next round? Set a new path here. Overuse of this var will make me upset.
-	var/current_skin //Has the item been reskinned?
+	var/current_skin //the item reskin
 	var/list/unique_reskin //List of options to reskin.
+	var/always_reskinnable = FALSE
 
 	// Access levels, used in modules\jobs\access.dm
 	var/list/req_access
@@ -228,26 +229,26 @@
 	..()
 	if(obj_flags & UNIQUE_RENAME)
 		to_chat(user, "<span class='notice'>Use a pen on it to rename it or change its description.</span>")
-	if(unique_reskin && !current_skin)
+	if(unique_reskin && (!current_skin || always_reskinnable))
 		to_chat(user, "<span class='notice'>Alt-click it to reskin it.</span>")
 
 /obj/AltClick(mob/user)
 	. = ..()
-	if(unique_reskin && !current_skin && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
+	if(unique_reskin && (!current_skin || always_reskinnable) && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
 		reskin_obj(user)
 
 /obj/proc/reskin_obj(mob/M)
 	if(!LAZYLEN(unique_reskin))
 		return
-	to_chat(M, "<b>Reskin options for [name]:</b>")
+	var/dat = "<b>Reskin options for [name]:</b>\n"
 	for(var/V in unique_reskin)
 		var/output = icon2html(src, M, unique_reskin[V])
-		to_chat(M, "[V]: <span class='reallybig'>[output]</span>")
+		dat += "[V]: <span class='reallybig'>[output]</span>\n"
+	to_chat(M, dat)
 
-	var/choice = input(M,"Warning, you can only reskin [src] once!","Reskin Object") as null|anything in unique_reskin
-	if(!QDELETED(src) && choice && !current_skin && !M.incapacitated() && in_range(M,src))
-		if(!unique_reskin[choice])
-			return
-		current_skin = choice
-		icon_state = unique_reskin[choice]
-		to_chat(M, "[src] is now skinned as '[choice].'")
+	var/choice = input(M, always_reskinnable ? "Choose the a reskin for [src]" : "Warning, you can only reskin [src] once!","Reskin Object") as null|anything in unique_reskin
+	if(QDELETED(src) || !choice || (current_skin && !always_reskinnable) || M.incapacitated() || !in_range(M,src) || !unique_reskin[choice] || unique_reskin[choice] == current_skin)
+		return
+	current_skin = choice
+	icon_state = unique_reskin[choice]
+	to_chat(M, "[src] is now skinned as '[choice]'.")

code/modules/admin/verbs/pray.dm

@@ -25,8 +25,8 @@
 		cross.icon_state = "kingyellow"
 		font_color = "blue"
 		prayer_type = "CHAPLAIN PRAYER"
-		if(SSreligion.deity)
-			deity = SSreligion.deity
+		if(GLOB.deity)
+			deity = GLOB.deity
 	else if(iscultist(usr))
 		cross.icon_state = "tome"
 		font_color = "red"

code/modules/antagonists/changeling/powers/adrenaline.dm

@@ -1,8 +1,9 @@
 /obj/effect/proc_holder/changeling/adrenaline
 	name = "Adrenaline Sacs"
 	desc = "We evolve additional sacs of adrenaline throughout our body."
-	helptext = "Removes all stuns instantly and adds a short-term reduction in further stuns. Can be used while unconscious. Continued use poisons the body."
+	helptext = "Removes all stuns instantly and adds a short-term reduction in further stuns. Can be used while unconscious. Continued use poisons the body. This ability is loud, and might cause our blood to react violently to heat."
 	chemical_cost = 30
+	loudness = 2
 	dna_cost = 2
 	req_human = 1
 	req_stat = UNCONSCIOUS
@@ -13,4 +14,4 @@
 //Recover from stuns.
 /obj/effect/proc_holder/changeling/adrenaline/sting_action(mob/living/user)
 	user.do_adrenaline(0, FALSE, 70, 0, TRUE, list("epinephrine" = 3, "changelingmeth" = 10, "mannitol" = 10, "regen_jelly" = 10, "changelingadrenaline" = 5), "<span class='notice'>Energy rushes through us.</span>", 0, 0.75, 0)
-	return TRUE
+	return TRUE

code/modules/awaymissions/corpse.dm

@@ -68,6 +68,7 @@
 		GLOB.poi_list |= src
 		LAZYADD(GLOB.mob_spawners[job_description ? job_description : name], src)
 
+
 /obj/effect/mob_spawn/Destroy()
 	GLOB.poi_list -= src
 	LAZYREMOVE(GLOB.mob_spawners[job_description ? job_description : name], src)
@@ -75,6 +76,9 @@
 		GLOB.mob_spawners -= job_description ? job_description : name
 	return ..()
 
+/obj/effect/mob_spawn/proc/can_latejoin() //If it can be taken from the lobby.
+	return TRUE
+
 /obj/effect/mob_spawn/proc/special(mob/M)
 	return
 

code/modules/cargo/packs.dm

@@ -1960,6 +1960,17 @@
 	crate_name = "hydroponics backpack crate"
 	crate_type = /obj/structure/closet/crate/secure
 
+/datum/supply_pack/organic/mre
+	name = "MRE supply kit (emergency rations)"
+	desc = "The lights are out. Oxygen's running low. You've run out of food except space weevils. Don't let this be you! Order our NT branded MRE kits today! This pack contains 5 MRE packs with a randomized menu and an oxygen tank."
+	cost = 2000
+	contains = list(/obj/item/storage/box/mre/menu1/safe,
+					/obj/item/storage/box/mre/menu1/safe,
+					/obj/item/storage/box/mre/menu2/safe,
+					/obj/item/storage/box/mre/menu2/safe,
+					/obj/item/storage/box/mre/menu3)
+	crate_name = "MRE crate (emergency rations)"
+
 /datum/supply_pack/organic/pizza
 	name = "Pizza Crate"
 	desc = "Best prices on this side of the galaxy. All deliveries are guaranteed to be 99% anomaly-free!"
@@ -2252,7 +2263,8 @@
 					/obj/item/storage/fancy/cigarettes/cigpack_shadyjims,
 					/obj/item/clothing/mask/gas/syndicate,
 					/obj/item/clothing/neck/necklace/dope,
-					/obj/item/vending_refill/donksoft)
+					/obj/item/vending_refill/donksoft,
+					/obj/item/circuitboard/computer/arcade/amputation)
 	crate_name = "crate"
 
 /datum/supply_pack/costumes_toys/foamforce

code/modules/client/asset_cache.dm

@@ -467,6 +467,24 @@ GLOBAL_LIST_EMPTY(asset_datums)
 		"stamp-law" = 'icons/stamp_icons/large_stamp-law.png'
 	)
 
+/datum/asset/spritesheet/simple/minesweeper
+	name = "minesweeper"
+	assets = list(
+		"1" = 'icons/misc/minesweeper_tiles/one.png',
+		"2" = 'icons/misc/minesweeper_tiles/two.png',
+		"3" = 'icons/misc/minesweeper_tiles/three.png',
+		"4" = 'icons/misc/minesweeper_tiles/four.png',
+		"5" = 'icons/misc/minesweeper_tiles/five.png',
+		"6" = 'icons/misc/minesweeper_tiles/six.png',
+		"7" = 'icons/misc/minesweeper_tiles/seven.png',
+		"8" = 'icons/misc/minesweeper_tiles/eight.png',
+		"empty" = 'icons/misc/minesweeper_tiles/empty.png',
+		"flag" = 'icons/misc/minesweeper_tiles/flag.png',
+		"hidden" = 'icons/misc/minesweeper_tiles/hidden.png',
+		"mine" = 'icons/misc/minesweeper_tiles/mine.png',
+		"minehit" = 'icons/misc/minesweeper_tiles/minehit.png'
+	)
+
 /datum/asset/simple/IRV
 	assets = list(
 		"jquery-ui.custom-core-widgit-mouse-sortable-min.js" = 'html/IRV/jquery-ui.custom-core-widgit-mouse-sortable-min.js',

code/modules/client/preferences.dm

@@ -59,6 +59,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/preferred_map = null
 	var/pda_style = MONO
 	var/pda_color = "#808000"
+	var/pda_skin = PDA_SKIN_ALT
 
 	var/uses_glasses_colour = 0
 
@@ -685,48 +686,48 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			else
 				if(pref_species.use_skintones)
 					dat += "<b>Genitals use skintone:</b><a href='?_src_=prefs;preference=genital_colour'>[features["genitals_use_skintone"] == TRUE ? "Yes" : "No"]</a>"
-				dat += "<b>Has Penis:</b>"
+				dat += "<h3>Penis</h3>"
 				dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=has_cock'>[features["has_cock"] == TRUE ? "Yes" : "No"]</a>"
-				if(features["has_cock"] == TRUE)
+				if(features["has_cock"])
 					if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
-						dat += "<b>Penis Color:</b>"
-						dat += "<span style='border: 1px solid #161616; background-color: #[skintone2hex(skin_tone)];'>&nbsp;&nbsp;&nbsp;</span>(Skin tone overriding)<br>"
+						dat += "<b>Penis Color:</b></a><BR>"
+						dat += "<span style='border: 1px solid #161616; background-color: #[skintone2hex(skin_tone)];'>&nbsp;&nbsp;&nbsp;</span>(Skin tone overriding)</a><br>"
 					else
-						dat += "<b>Penis Color:</b>"
+						dat += "<b>Penis Color:</b></a><BR>"
 						dat += "<span style='border: 1px solid #161616; background-color: #[features["cock_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=cock_color;task=input'>Change</a><br>"
 					dat += "<b>Penis Shape:</b> <a style='display:block;width:120px' href='?_src_=prefs;preference=cock_shape;task=input'>[features["cock_shape"]]</a>"
 					dat += "<b>Penis Length:</b> <a style='display:block;width:120px' href='?_src_=prefs;preference=cock_length;task=input'>[features["cock_length"]] inch(es)</a>"
 					dat += "<b>Has Testicles:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=has_balls'>[features["has_balls"] == TRUE ? "Yes" : "No"]</a>"
-					if(features["has_balls"] == TRUE)
+					if(features["has_balls"])
 						if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
-							dat += "<b>Testicles Color:</b>"
+							dat += "<b>Testicles Color:</b></a><BR>"
 							dat += "<span style='border: 1px solid #161616; background-color: #[skintone2hex(skin_tone)];'>&nbsp;&nbsp;&nbsp;</span>(Skin tone overriding)<br>"
 						else
-							dat += "<b>Testicles Color:</b>"
+							dat += "<b>Testicles Color:</b></a><BR>"
 							dat += "<span style='border: 1px solid #161616; background-color: #[features["balls_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=balls_color;task=input'>Change</a><br>"
 						dat += "<b>Testicles showing:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=balls_shape;task=input'>[features["balls_shape"]]</a>"
 				dat += APPEARANCE_CATEGORY_COLUMN
-				dat += "<b>Has Vagina:</b>"
+				dat += "<h3>Vagina</h3>"
 				dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=has_vag'>[features["has_vag"] == TRUE ? "Yes" : "No"]</a>"
 				if(features["has_vag"])
 					dat += "<b>Vagina Type:</b> <a style='display:block;width:100px' href='?_src_=prefs;preference=vag_shape;task=input'>[features["vag_shape"]]</a>"
 					if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
-						dat += "<b>Vagina Color:</b>"
+						dat += "<b>Vagina Color:</b></a><BR>"
 						dat += "<span style='border: 1px solid #161616; background-color: #[skintone2hex(skin_tone)];'>&nbsp;&nbsp;&nbsp;</span>(Skin tone overriding)<br>"
 					else
-						dat += "<b>Vagina Color:</b>"
+						dat += "<b>Vagina Color:</b></a><BR>"
 						dat += "<span style='border: 1px solid #161616; background-color: #[features["vag_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=vag_color;task=input'>Change</a><br>"
 					dat += "<b>Has Womb:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=has_womb'>[features["has_womb"] == TRUE ? "Yes" : "No"]</a>"
 				dat += "</td>"
 				dat += APPEARANCE_CATEGORY_COLUMN
-				dat += "<b>Has Breasts:</b>"
+				dat += "<h3>Breasts</h3>"
 				dat += "<a style='display:block;width:50px' href='?_src_=prefs;preference=has_breasts'>[features["has_breasts"] == TRUE ? "Yes" : "No"]</a>"
 				if(features["has_breasts"])
 					if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)
-						dat += "<b>Color:</b>"
+						dat += "<b>Color:</b></a><BR>"
 						dat += "<span style='border: 1px solid #161616; background-color: #[skintone2hex(skin_tone)];'>&nbsp;&nbsp;&nbsp;</span>(Skin tone overriding)<br>"
 					else
-						dat += "<b>Color:</b>"
+						dat += "<b>Color:</b></a><BR>"
 						dat += "<span style='border: 1px solid #161616; background-color: #[features["breasts_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=breasts_color;task=input'>Change</a><br>"
 					dat += "<b>Cup Size:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=breasts_size;task=input'>[features["breasts_size"]]</a>"
 					dat += "<b>Breast Shape:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=breasts_shape;task=input'>[features["breasts_shape"]]</a>"
@@ -746,6 +747,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<br>"
 			dat += "<b>PDA Color:</b> <span style='border:1px solid #161616; background-color: [pda_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=pda_color;task=input'>Change</a><BR>"
 			dat += "<b>PDA Style:</b> <a href='?_src_=prefs;task=input;preference=pda_style'>[pda_style]</a><br>"
+			dat += "<b>PDA Reskin:</b> <a href='?_src_=prefs;task=input;preference=pda_skin'>[pda_skin]</a><br>"
 			dat += "<br>"
 			dat += "<b>Ghost Ears:</b> <a href='?_src_=prefs;preference=ghost_ears'>[(chat_toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"]</a><br>"
 			dat += "<b>Ghost Radio:</b> <a href='?_src_=prefs;preference=ghost_radio'>[(chat_toggles & CHAT_GHOSTRADIO) ? "All Messages":"No Messages"]</a><br>"
@@ -1986,6 +1988,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					var/pickedPDAColor = input(user, "Choose your PDA Interface color.", "Character Preference",pda_color) as color|null
 					if(pickedPDAColor)
 						pda_color = pickedPDAColor
+				if("pda_skin")
+					var/pickedPDASkin = input(user, "Choose your PDA reskin.", "Character Preference", pda_skin) as null|anything in GLOB.pda_reskins
+					if(pickedPDASkin)
+						pda_skin = pickedPDASkin
 
 		else
 			switch(href_list["preference"])
@@ -1996,6 +2002,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					arousable = !arousable
 				if("has_cock")
 					features["has_cock"] = !features["has_cock"]
+					if(features["has_cock"] == FALSE)
+						features["has_balls"] = FALSE
 				if("has_balls")
 					features["has_balls"] = !features["has_balls"]
 				if("has_ovi")
@@ -2010,6 +2018,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					features["has_breasts"] = !features["has_breasts"]
 				if("has_vag")
 					features["has_vag"] = !features["has_vag"]
+					if(features["has_vag"] == FALSE)
+						features["has_womb"] = FALSE
 				if("has_womb")
 					features["has_womb"] = !features["has_womb"]
 				if("exhibitionist")

code/modules/client/preferences_savefile.dm

@@ -108,6 +108,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["tip_delay"]			>> tip_delay
 	S["pda_style"]			>> pda_style
 	S["pda_color"]			>> pda_color
+	S["pda_skin"]			>> pda_skin
 
 	//citadel code
 	S["arousable"]			>> arousable
@@ -144,6 +145,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	be_special		= SANITIZE_LIST(be_special)
 	pda_style		= sanitize_inlist(pda_style, GLOB.pda_styles, initial(pda_style))
 	pda_color		= sanitize_hexcolor(pda_color, 6, 1, initial(pda_color))
+	pda_skin		= sanitize_inlist(pda_skin, GLOB.pda_reskins, PDA_SKIN_ALT)
 
 	screenshake			= sanitize_integer(screenshake, 0, 800, initial(screenshake))
 	damagescreenshake	= sanitize_integer(damagescreenshake, 0, 2, initial(damagescreenshake))

code/modules/clothing/chameleon.dm

@@ -226,6 +226,19 @@
 			CL.flags_cover = initial(PCL.flags_cover)
 	target.icon = initial(picked_item.icon)
 
+/datum/action/item_action/chameleon/change/pda/update_item(obj/item/pda/picked_item)
+	if(!istype(target, /obj/item/pda))
+		return ..()
+	var/obj/item/pda/P = target
+	P.name = initial(picked_item.name)
+	P.desc = initial(picked_item.desc)
+	P.icon_state = initial(picked_item.icon_state)
+	P.item_state = initial(picked_item.item_state)
+	P.item_color = initial(picked_item.item_color)
+	P.overlays_offsets = initial(picked_item.overlays_offsets)
+	P.set_new_overlays()
+	P.update_icon()
+
 /datum/action/item_action/chameleon/change/Trigger()
 	if(!IsAvailable())
 		return
@@ -584,7 +597,7 @@
 
 /obj/item/pda/chameleon
 	name = "PDA"
-	var/datum/action/item_action/chameleon/change/chameleon_action
+	var/datum/action/item_action/chameleon/change/pda/chameleon_action
 
 /obj/item/pda/chameleon/Initialize()
 	. = ..()

code/modules/clothing/glasses/_glasses.dm

@@ -98,7 +98,7 @@
 	desc = "A pair of snazzy goggles used to protect against chemical spills. Fitted with an analyzer for scanning items and reagents."
 	icon_state = "purple"
 	item_state = "glasses"
-	scan_reagents = 1 //You can see reagents while wearing science goggles
+	scan_reagents = TRUE //You can see reagents while wearing science goggles
 	actions_types = list(/datum/action/item_action/toggle_research_scanner)
 	glass_colour_type = /datum/client_colour/glass_colour/purple
 	resistance_flags = ACID_PROOF
@@ -202,7 +202,7 @@
 /obj/item/clothing/glasses/sunglasses/reagent
 	name = "beer goggles"
 	desc = "A pair of sunglasses outfitted with apparatus to scan reagents."
-	scan_reagents = 1
+	scan_reagents = TRUE
 
 /obj/item/clothing/glasses/sunglasses/garb
 	name = "black gar glasses"
@@ -377,7 +377,7 @@
 	item_state = "godeye"
 	vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS
 	darkness_view = 8
-	scan_reagents = 1
+	scan_reagents = TRUE
 	item_flags = NODROP
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	resistance_flags = LAVA_PROOF | FIRE_PROOF

code/modules/clothing/spacesuits/hardsuit.dm

@@ -445,7 +445,7 @@
 	flash_protect = 0
 	armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 75)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-	scan_reagents = 1
+	scan_reagents = TRUE
 
 /obj/item/clothing/suit/space/hardsuit/medical
 	icon_state = "hardsuit-medical"
@@ -467,7 +467,7 @@
 	max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
 	armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 100, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 80)
 	var/obj/machinery/doppler_array/integrated/bomb_radar
-	scan_reagents = 1
+	scan_reagents = TRUE
 	actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_research_scanner)
 
 /obj/item/clothing/head/helmet/space/hardsuit/rd/Initialize()
@@ -626,7 +626,7 @@
 	item_state = "anc_hardsuit"
 	armor = list("melee" = 10, "bullet" = 5, "laser" = 5, "energy" = 500, "bomb" = 500, "bio" = 500, "rad" = 500, "fire" = 500, "acid" = 500)
 	slowdown = 6 //Slow
-	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage, /obj/item/construction/rcd, /obj/item/pipe_dispenser) 
+	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/storage, /obj/item/construction/rcd, /obj/item/pipe_dispenser)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ancient/mason
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
@@ -639,7 +639,7 @@
 	armor = list("melee" = 10, "bullet" = 5, "laser" = 5, "energy" = 500, "bomb" = 500, "bio" = 500, "rad" = 500, "fire" = 500, "acid" = 500)
 	item_color = "ancient"
 	brightness_on = 16
-	scan_reagents = 1
+	scan_reagents = TRUE
 	flash_protect = 5 //We will not be flash by bombs
 	tint = 1
 	var/obj/machinery/doppler_array/integrated/bomb_radar

code/modules/clothing/suits/armor.dm

@@ -58,7 +58,8 @@
 	item_state = "hostrench"
 	flags_inv = 0
 	strip_delay = 80
-
+	unique_reskin = list("Coat" = "hostrench", "Cloak" = "trenchcloak")
+	
 /obj/item/clothing/suit/armor/vest/warden
 	name = "warden's jacket"
 	desc = "A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets."

code/modules/food_and_drinks/drinks/drinks.dm

@@ -204,6 +204,14 @@
 	resistance_flags = FREEZE_PROOF
 	isGlass = FALSE
 
+//Used by MREs
+/obj/item/reagent_containers/food/drinks/coffee/type2
+	name = "\improper Coffee, instant (type 2)"
+	desc = "Coffee that's been blow dried into a granulated powder. This packet includes self heating water for your nutritional pleasure."
+	icon = 'icons/obj/food/containers.dmi'
+	icon_state = "condi_cornoil"
+
+
 /obj/item/reagent_containers/food/drinks/ice
 	name = "ice cup"
 	desc = "Careful, cold ice, do not chew."

code/modules/food_and_drinks/food/snacks.dm

@@ -291,19 +291,23 @@ All foods are distributed among various categories. Use common sense.
 				S.reagents.add_reagent(r_id, amount)
 
 /obj/item/reagent_containers/food/snacks/microwave_act(obj/machinery/microwave/M)
+	var/turf/T = get_turf(src)
+	var/obj/item/result
 	if(cooked_type)
-		var/obj/item/reagent_containers/food/snacks/S = new cooked_type(get_turf(src))
-		if(M)
-			initialize_cooked_food(S, M.efficiency)
+		result = new cooked_type(T)
+		if(istype(M))
+			initialize_cooked_food(result, M.efficiency)
 		else
-			initialize_cooked_food(S, 1)
-		SSblackbox.record_feedback("tally", "food_made", 1, type)
+			initialize_cooked_food(result, 1)
+		SSblackbox.record_feedback("tally", "food_made", 1, result.type)
 	else
-		new /obj/item/reagent_containers/food/snacks/badrecipe(src)
-		if(M && M.dirty < 100)
+		result = new /obj/item/reagent_containers/food/snacks/badrecipe(T)
+		if(istype(M) && M.dirty < 100)
 			M.dirty++
 	qdel(src)
 
+	return result
+
 /obj/item/reagent_containers/food/snacks/Destroy()
 	if(contents)
 		for(var/atom/movable/something in contents)

code/modules/food_and_drinks/food/snacks_pizza.dm

@@ -225,3 +225,12 @@
 	filling_color = "#FFFFFF"
 	foodtype = GRAIN | VEGETABLES
 
+
+// Used by MREs
+/obj/item/reagent_containers/food/snacks/pizzaslice/pepperoni
+	name = "\improper MRE pepperoni pizza slice"
+	desc = "A freeze dried, dehydrated slice of bread with tomato sauce, pepperoni and cheese."
+	icon_state = "meatpizzaslice"
+	filling_color = "#A52A2A"
+	tastes = list("cardboard" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2)
+	foodtype = GRAIN | VEGETABLES | DAIRY | MEAT

code/modules/food_and_drinks/kitchen_machinery/microwave.dm

@@ -12,322 +12,343 @@
 	pass_flags = PASSTABLE
 	light_color = LIGHT_COLOR_YELLOW
 	light_power = 0.9
+	var/wire_disabled = FALSE // is its internal wire cut?
 	var/operating = FALSE // Is it on?
-	var/dirty = 0 // = {0..100} Does it need cleaning?
-	var/broken = 0 // ={0,1,2} How broken is it???
-	var/max_n_of_items = 10 // whatever fat fuck made this a global var needs to look at themselves in the mirror sometime
+	var/dirty = 0 // 0 to 100 // Does it need cleaning?
+	var/dirty_anim_playing = FALSE
+	var/broken = 0 // 0, 1 or 2 // How broken is it???
+	var/max_n_of_items = 10
 	var/efficiency = 0
 	var/datum/looping_sound/microwave/soundloop
+	var/list/ingredients = list() // may only contain /atom/movables
 
-//Microwaving doesn't use recipes, instead it calls the microwave_act of the objects. For food, this creates something based on the food's cooked_type
+	var/static/radial_examine = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_examine")
+	var/static/radial_eject = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_eject")
+	var/static/radial_use = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_use")
 
-/*******************
-*   Initialising
-********************/
+	// we show the button even if the proc will not work
+	var/static/list/radial_options = list("eject" = radial_eject, "use" = radial_use)
+	var/static/list/ai_radial_options = list("eject" = radial_eject, "use" = radial_use, "examine" = radial_examine)
 
 /obj/machinery/microwave/Initialize()
 	. = ..()
+	wires = new /datum/wires/microwave(src)
 	create_reagents(100)
 	soundloop = new(list(src), FALSE)
 
+/obj/machinery/microwave/Destroy()
+	eject()
+	if(wires)
+		QDEL_NULL(wires)
+	. = ..()
+
 /obj/machinery/microwave/RefreshParts()
-	var/E
-	var/max_items = 10
+	efficiency = 0
 	for(var/obj/item/stock_parts/micro_laser/M in component_parts)
-		E += M.rating
+		efficiency += M.rating
 	for(var/obj/item/stock_parts/matter_bin/M in component_parts)
-		max_items = 10 * M.rating
-	efficiency = E
-	max_n_of_items = max_items
+		max_n_of_items = 10 * M.rating
+		break
 
 /obj/machinery/microwave/examine(mob/user)
-	..()
+	. = ..()
 	if(!operating)
 		to_chat(user, "<span class='notice'>Alt-click [src] to turn it on.</span>")
 
-/*******************
-*   Item Adding
-********************/
+	if(!in_range(user, src) && !issilicon(user) && !isobserver(user))
+		to_chat(user, "<span class='warning'>You're too far away to examine [src]'s contents and display!</span>")
+		return
+	if(operating)
+		to_chat(user, "<span class='notice'>\The [src] is operating.</span>")
+		return
+
+	if(length(ingredients))
+		if(issilicon(user))
+			to_chat(user, "<span class='notice'>\The [src] camera shows:</span>")
+		else
+			to_chat(user, "<span class='notice'>\The [src] contains:</span>")
+		var/list/items_counts = new
+		for(var/i in ingredients)
+			if(istype(i, /obj/item/stack))
+				var/obj/item/stack/S = i
+				items_counts[S.name] += S.amount
+			else
+				var/atom/movable/AM = i
+				items_counts[AM.name]++
+		for(var/O in items_counts)
+			to_chat(user, "<span class='notice'>- [items_counts[O]]x [O].</span>")
+	else
+		to_chat(user, "<span class='notice'>\The [src] is empty.</span>")
+
+	if(!(stat & (NOPOWER|BROKEN)))
+		to_chat(user, "<span class='notice'>The status display reads:</span>")
+		to_chat(user, "<span class='notice'>- Capacity: <b>[max_n_of_items]</b> items.<span>")
+		to_chat(user, "<span class='notice'>- Cook time reduced by <b>[(efficiency - 1) * 25]%</b>.<span>")
+
+/obj/machinery/microwave/update_icon()
+	if(broken)
+		icon_state = "mwb"
+	else if(dirty_anim_playing)
+		icon_state = "mwbloody1"
+	else if(dirty == 100)
+		icon_state = "mwbloody"
+	else if(operating)
+		icon_state = "mw1"
+	else if(panel_open)
+		icon_state = "mw-o"
+	else
+		icon_state = "mw"
 
 /obj/machinery/microwave/attackby(obj/item/O, mob/user, params)
 	if(operating)
 		return
-	if(!broken && dirty<100)
-		if(default_deconstruction_screwdriver(user, "mw-o", "mw", O))
-			return
-		if(default_unfasten_wrench(user, O))
-			return
-
 	if(default_deconstruction_crowbar(O))
 		return
 
-	if(src.broken > 0)
-		if(src.broken == 2 && istype(O, /obj/item/wirecutters)) // If it's broken and they're using a screwdriver
-			user.visible_message( \
-				"[user] starts to fix part of the microwave.", \
-				"<span class='notice'>You start to fix part of the microwave...</span>" \
-			)
-			if (O.use_tool(src, user, 20))
-				user.visible_message( \
-					"[user] fixes part of the microwave.", \
-					"<span class='notice'>You fix part of the microwave.</span>" \
-				)
-				src.broken = 1 // Fix it a bit
-		else if(src.broken == 1 && istype(O, /obj/item/weldingtool)) // If it's broken and they're doing the wrench
-			user.visible_message( \
-				"[user] starts to fix part of the microwave.", \
-				"<span class='notice'>You start to fix part of the microwave...</span>" \
-			)
-			if (O.use_tool(src, user, 20))
-				user.visible_message( \
-					"[user] fixes the microwave.", \
-					"<span class='notice'>You fix the microwave.</span>" \
-				)
-				src.icon_state = "mw"
-				src.broken = 0 // Fix it!
-				src.dirty = 0 // just to be sure
-				return 0 //to use some fuel
+	if(dirty < 100)
+		if(default_deconstruction_screwdriver(user, icon_state, icon_state, O) || default_unfasten_wrench(user, O))
+			update_icon()
+			return
+
+	if(panel_open && is_wire_tool(O))
+		wires.interact(user)
+		return TRUE
+
+	if(broken > 0)
+		if(broken == 2 && O.tool_behaviour == TOOL_WIRECUTTER) // If it's broken and they're using a screwdriver
+			user.visible_message("[user] starts to fix part of \the [src].", "<span class='notice'>You start to fix part of \the [src]...</span>")
+			if(O.use_tool(src, user, 20))
+				user.visible_message("[user] fixes part of \the [src].", "<span class='notice'>You fix part of \the [src].</span>")
+				broken = 1 // Fix it a bit
+		else if(broken == 1 && O.tool_behaviour == TOOL_WELDER) // If it's broken and they're doing the wrench
+			user.visible_message("[user] starts to fix part of \the [src].", "<span class='notice'>You start to fix part of \the [src]...</span>")
+			if(O.use_tool(src, user, 20))
+				user.visible_message("[user] fixes \the [src].", "<span class='notice'>You fix \the [src].</span>")
+				broken = 0
+				update_icon()
+				return FALSE //to use some fuel
 		else
 			to_chat(user, "<span class='warning'>It's broken!</span>")
-			return 1
-	else if(istype(O, /obj/item/reagent_containers/spray/))
+			return TRUE
+		return
+
+	if(istype(O, /obj/item/reagent_containers/spray))
 		var/obj/item/reagent_containers/spray/clean_spray = O
-		if(clean_spray.reagents.has_reagent("cleaner",clean_spray.amount_per_transfer_from_this))
-			clean_spray.reagents.remove_reagent("cleaner",clean_spray.amount_per_transfer_from_this,1)
+		if(clean_spray.reagents.has_reagent("cleaner", clean_spray.amount_per_transfer_from_this))
+			clean_spray.reagents.remove_reagent("cleaner", clean_spray.amount_per_transfer_from_this,1)
 			playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
-			user.visible_message( \
-				"[user] has cleaned the microwave.", \
-				"<span class='notice'>You clean the microwave.</span>" \
-			)
-			src.dirty = 0 // It's clean!
-			src.broken = 0 // just to be sure
-			src.icon_state = "mw"
-			src.updateUsrDialog()
-			return 1 // Disables the after-attack so we don't spray the floor/user.
+			user.visible_message("[user] has cleaned \the [src].", "<span class='notice'>You clean \the [src].</span>")
+			dirty = 0
+			update_icon()
 		else
 			to_chat(user, "<span class='warning'>You need more space cleaner!</span>")
-			return 1
+		return TRUE
 
-	else if(istype(O, /obj/item/soap/)) // If they're trying to clean it then let them
+	if(istype(O, /obj/item/soap))
 		var/obj/item/soap/P = O
-		user.visible_message( \
-			"[user] starts to clean the microwave.", \
-			"<span class='notice'>You start to clean the microwave...</span>" \
-		)
-		if (do_after(user, P.cleanspeed, target = src))
-			user.visible_message( \
-				"[user] has cleaned the microwave.", \
-				"<span class='notice'>You clean the microwave.</span>" \
-			)
-			src.dirty = 0 // It's clean!
-			src.broken = 0 // just to be sure
-			src.icon_state = "mw"
+		user.visible_message("[user] starts to clean \the [src].", "<span class='notice'>You start to clean \the [src]...</span>")
+		if(do_after(user, P.cleanspeed, target = src))
+			user.visible_message("[user] has cleaned \the [src].", "<span class='notice'>You clean \the [src].</span>")
+			dirty = 0
+			update_icon()
+		return TRUE
 
-	else if(src.dirty==100) // The microwave is all dirty so can't be used!
-		to_chat(user, "<span class='warning'>It's dirty!</span>")
-		return 1
+	if(dirty == 100) // The microwave is all dirty so can't be used!
+		to_chat(user, "<span class='warning'>\The [src] is dirty!</span>")
+		return TRUE
 
-	else if(istype(O, /obj/item/storage/bag/tray))
+	if(istype(O, /obj/item/storage/bag/tray))
 		var/obj/item/storage/T = O
 		var/loaded = 0
 		for(var/obj/item/reagent_containers/food/snacks/S in T.contents)
-			if (contents.len>=max_n_of_items)
-				to_chat(user, "<span class='warning'>[src] is full, you can't put anything in!</span>")
-				return 1
+			if(ingredients.len >= max_n_of_items)
+				to_chat(user, "<span class='warning'>\The [src] is full, you can't put anything in!</span>")
+				return TRUE
 			if(SEND_SIGNAL(T, COMSIG_TRY_STORAGE_TAKE, S, src))
 				loaded++
-
+				ingredients += S
 		if(loaded)
-			to_chat(user, "<span class='notice'>You insert [loaded] items into [src].</span>")
+			to_chat(user, "<span class='notice'>You insert [loaded] items into \the [src].</span>")
+		return
 
+	if(O.w_class <= WEIGHT_CLASS_NORMAL && !istype(O, /obj/item/storage) && user.a_intent == INTENT_HELP)
+		if(ingredients.len >= max_n_of_items)
+			to_chat(user, "<span class='warning'>\The [src] is full, you can't put anything in!</span>")
+			return TRUE
+		if(!user.transferItemToLoc(O, src))
+			to_chat(user, "<span class='warning'>\The [O] is stuck to your hand!</span>")
+			return FALSE
 
-	else if(O.w_class <= WEIGHT_CLASS_NORMAL && !istype(O, /obj/item/storage) && user.a_intent == INTENT_HELP)
-		if (contents.len>=max_n_of_items)
-			to_chat(user, "<span class='warning'>[src] is full, you can't put anything in!</span>")
-			return 1
-		else
-			if(!user.transferItemToLoc(O, src))
-				to_chat(user, "<span class='warning'>\the [O] is stuck to your hand, you cannot put it in \the [src]!</span>")
-				return 0
+		ingredients += O
+		user.visible_message("[user] has added \a [O] to \the [src].", "<span class='notice'>You add [O] to \the [src].</span>")
+		return
 
-			user.visible_message( \
-				"[user] has added \the [O] to \the [src].", \
-				"<span class='notice'>You add \the [O] to \the [src].</span>")
-
-	else
-		..()
-	updateUsrDialog()
+	..()
 
 /obj/machinery/microwave/AltClick(mob/user)
-	if(user.canUseTopic(src, BE_CLOSE) && !(operating || broken > 0 || panel_open || !anchored || dirty == 100))
+	if(user.canUseTopic(src, !issilicon(usr)))
 		cook()
 
-/*******************
-*   Microwave Menu
-********************/
-
-/obj/machinery/microwave/ui_interact(mob/user) // The microwave Menu
+/obj/machinery/microwave/ui_interact(mob/user)
 	. = ..()
-	if(panel_open || !anchored)
+
+	if(operating || panel_open || !anchored || !user.canUseTopic(src, !issilicon(user)))
+		return
+	if(isAI(user) && (stat & NOPOWER))
 		return
-	var/dat = "<div class='statusDisplay'>"
-	if(broken > 0)
-		dat += "ERROR: 09734014-A2379-D18746 --Bad memory<BR>Contact your operator or use command line to rebase memory ///git checkout {HEAD} -a commit pull --rebase push {*NEW HEAD*}</div>"    //Thats how all the git fiddling looks to me
-	else if(operating)
-		dat += "Microwaving in progress!<BR>Please wait...!</div>"
-	else if(dirty==100)
-		dat += "ERROR: >> 0 --Response input zero<BR>Contact your operator of the device manifactor support.</div>"
-	else
-		var/list/items_counts = new
-		for (var/obj/O in contents)
-			if(istype(O, /obj/item/stack/))
-				var/obj/item/stack/S = O
-				items_counts[O.name] += S.amount
-			else
-				items_counts[O.name]++
 
-		for (var/O in items_counts)
-			var/N = items_counts[O]
-			dat += "[capitalize(O)]: [N]<BR>"
-
-		if (items_counts.len==0)
-			dat += "The microwave is empty.</div>"
+	if(!length(ingredients))
+		if(isAI(user))
+			examine(user)
 		else
-			dat = "<h3>Ingredients:</h3>[dat]</div>"
-		dat += "<A href='?src=[REF(src)];action=cook'>Turn on</A>"
-		dat += "<A href='?src=[REF(src)];action=dispose'>Eject ingredients</A><BR>"
+			to_chat(user, "<span class='warning'>\The [src] is empty.</span>")
+		return
 
-	var/datum/browser/popup = new(user, "microwave", name, 300, 300)
-	popup.set_content(dat)
-	popup.open()
+	var/choice = show_radial_menu(user, src, isAI(user) ? ai_radial_options : radial_options, require_near = !issilicon(user))
 
-/***********************************
-*   Microwave Menu Handling/Cooking
-************************************/
+	// post choice verification
+	if(operating || panel_open || !anchored || !user.canUseTopic(src, !issilicon(user)))
+		return
+	if(isAI(user) && (stat & NOPOWER))
+		return
+
+	usr.set_machine(src)
+	switch(choice)
+		if("eject")
+			eject()
+		if("use")
+			cook()
+		if("examine")
+			examine(user)
+
+/obj/machinery/microwave/proc/eject()
+	for(var/i in ingredients)
+		var/atom/movable/AM = i
+		AM.forceMove(drop_location())
+	ingredients.Cut()
 
 /obj/machinery/microwave/proc/cook()
 	if(stat & (NOPOWER|BROKEN))
 		return
+	if(operating || broken > 0 || panel_open || !anchored || dirty == 100)
+		return
+
+	if(wire_disabled)
+		audible_message("[src] buzzes.")
+		playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
+		return
+
+	if(prob(max((5 / efficiency) - 5, dirty * 5))) //a clean unupgraded microwave has no risk of failure
+		muck()
+		return
+	for(var/obj/O in ingredients)
+		if(istype(O, /obj/item/reagent_containers/food) || istype(O, /obj/item/grown))
+			continue
+		if(prob(min(dirty * 5, 100)))
+			start_can_fail()
+			return
+		break
 	start()
 
-	if (prob(max(5/efficiency-5,dirty*5))) //a clean unupgraded microwave has no risk of failure
-		muck_start()
-		if (!microwaving(4))
-			muck_finish()
-			return
-		muck_finish()
-		return
+/obj/machinery/microwave/proc/turn_on()
+	visible_message("\The [src] turns on.", "<span class='italics'>You hear a microwave humming.</span>")
+	operating = TRUE
 
-	else
-		if(has_extra_item() && prob(min(dirty*5,100)) && !microwaving(4))
-			broke()
-			return
+	set_light(1.5)
+	soundloop.start()
+	update_icon()
 
-		if(!microwaving(10))
-			abort()
-			return
-		stop()
+/obj/machinery/microwave/proc/spark()
+	visible_message("<span class='warning'>Sparks fly around [src]!</span>")
+	var/datum/effect_system/spark_spread/s = new
+	s.set_up(2, 1, src)
+	s.start()
 
-		var/metal = 0
-		for(var/obj/item/O in contents)
-			O.microwave_act(src)
-			if(O.materials[MAT_METAL])
-				metal += O.materials[MAT_METAL]
-
-		if(metal)
-			visible_message("<span class='warning'>Sparks fly around [src]!</span>")
-			if(prob(max(metal/2, 33)))
-				explosion(loc,0,1,2)
-			broke()
-			return
-
-		dropContents()
-		return
-
-/obj/machinery/microwave/proc/microwaving(seconds as num)
-	for (var/i=1 to seconds)
-		if (stat & (NOPOWER|BROKEN))
-			return 0
-		use_power(500)
-		sleep(max(12-2*efficiency,2)) // standard microwave means sleep(10). The better the efficiency, the faster the cooking
-	return 1
-
-/obj/machinery/microwave/proc/has_extra_item()
-	for (var/obj/O in contents)
-		if ( \
-				!istype(O, /obj/item/reagent_containers/food) && \
-				!istype(O, /obj/item/grown) \
-			)
-			return 1
-	return 0
+#define MICROWAVE_NORMAL 0
+#define MICROWAVE_MUCK 1
+#define MICROWAVE_PRE 2
 
 /obj/machinery/microwave/proc/start()
-	visible_message("The microwave turns on.", "<span class='italics'>You hear a microwave humming.</span>")
-	soundloop.start()
-	operating = TRUE
-	icon_state = "mw1"
-	set_light(1.5)
-	updateUsrDialog()
+	turn_on()
+	loop(MICROWAVE_NORMAL, 10)
 
-/obj/machinery/microwave/proc/abort()
-	operating = FALSE // Turn it off again aferwards
-	icon_state = "mw"
-	updateUsrDialog()
-	set_light(0)
-	soundloop.stop()
+/obj/machinery/microwave/proc/start_can_fail()
+	turn_on()
+	loop(MICROWAVE_PRE, 4)
 
-/obj/machinery/microwave/proc/stop()
-	abort()
+/obj/machinery/microwave/proc/muck()
+	turn_on()
+	playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
+	dirty_anim_playing = TRUE
+	update_icon()
+	loop(MICROWAVE_MUCK, 4)
 
-/obj/machinery/microwave/proc/dispose()
-	for (var/obj/O in contents)
-		O.forceMove(drop_location())
-	to_chat(usr, "<span class='notice'>You dispose of the microwave contents.</span>")
-	updateUsrDialog()
+/obj/machinery/microwave/proc/loop(type, time, wait = max(12 - 2 * efficiency, 2)) // standard wait is 10
+	if(stat & (NOPOWER|BROKEN))
+		if(MICROWAVE_PRE)
+			pre_fail()
+		return
+	if(!time)
+		switch(type)
+			if(MICROWAVE_NORMAL)
+				loop_finish()
+			if(MICROWAVE_MUCK)
+				muck_finish()
+			if(MICROWAVE_PRE)
+				pre_success()
+		return
+	time--
+	use_power(500)
+	addtimer(CALLBACK(src, .proc/loop, type, time, wait), wait)
 
-/obj/machinery/microwave/proc/muck_start()
-	playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) // Play a splat sound
-	icon_state = "mwbloody1" // Make it look dirty!!
+/obj/machinery/microwave/proc/loop_finish()
+	operating = FALSE
+
+	var/metal = 0
+	for(var/obj/item/O in ingredients)
+		O.microwave_act(src)
+		if(O.materials[MAT_METAL])
+			metal += O.materials[MAT_METAL]
+
+	if(metal)
+		spark()
+		broken = 2
+		if(prob(max(metal / 2, 33)))
+			explosion(loc, 0, 1, 2)
+	else
+		dropContents(ingredients)
+		ingredients.Cut()
+
+	after_finish_loop()
+
+/obj/machinery/microwave/proc/pre_fail()
+	broken = 2
+	operating = FALSE
+	spark()
+	after_finish_loop()
+
+/obj/machinery/microwave/proc/pre_success()
+	loop(MICROWAVE_NORMAL, 10)
 
 /obj/machinery/microwave/proc/muck_finish()
-	visible_message("<span class='warning'>The microwave gets covered in muck!</span>")
-	dirty = 100 // Make it dirty so it can't be used util cleaned
-	icon_state = "mwbloody" // Make it look dirty too
-	operating = FALSE // Turn it off again aferwards
-	updateUsrDialog()
+	visible_message("<span class='warning'>\The [src] gets covered in muck!</span>")
+
+	dirty = 100
+	dirty_anim_playing = FALSE
+	operating = FALSE
+
 	for(var/obj/item/reagent_containers/food/snacks/S in src)
 		if(prob(50))
 			new /obj/item/reagent_containers/food/snacks/badrecipe(src)
 			qdel(S)
+
+	after_finish_loop()
+
+/obj/machinery/microwave/proc/after_finish_loop()
 	set_light(0)
 	soundloop.stop()
+	update_icon()
 
-/obj/machinery/microwave/proc/broke()
-	var/datum/effect_system/spark_spread/s = new
-	s.set_up(2, 1, src)
-	s.start()
-	icon_state = "mwb" // Make it look all busted up and shit
-	visible_message("<span class='warning'>The microwave breaks!</span>") //Let them know they're stupid
-	broken = 2 // Make it broken so it can't be used util fixed
-	flags_1 = null //So you can't add condiments
-	operating = FALSE // Turn it off again aferwards
-	updateUsrDialog()
-	set_light(0)
-	soundloop.stop()
-
-/obj/machinery/microwave/Topic(href, href_list)
-	if(..() || panel_open)
-		return
-
-	usr.set_machine(src)
-	if(operating)
-		updateUsrDialog()
-		return
-
-	switch(href_list["action"])
-		if ("cook")
-			cook()
-
-		if ("dispose")
-			dispose()
-	updateUsrDialog()
+#undef MICROWAVE_NORMAL
+#undef MICROWAVE_MUCK
+#undef MICROWAVE_PRE

code/modules/food_and_drinks/pizzabox.dm

@@ -332,6 +332,12 @@
 /obj/item/pizzabox/infinite/proc/attune_pizza(mob/living/carbon/human/noms) //tonight on "proc names I never thought I'd type"
 	if(!pizza_preferences[noms.ckey])
 		pizza_preferences[noms.ckey] = pickweight(pizza_types)
+		if(noms.has_quirk(/datum/quirk/pineapple_liker))
+			pizza_preferences[noms.ckey] = /obj/item/reagent_containers/food/snacks/pizza/pineapple
+		else if(noms.has_quirk(/datum/quirk/pineapple_hater))
+			var/list/pineapple_pizza_liker = pizza_types.Copy()
+			pineapple_pizza_liker -= /obj/item/reagent_containers/food/snacks/pizza/pineapple
+			pizza_preferences[noms.ckey] = pickweight(pineapple_pizza_liker)
 		if(noms.mind && noms.mind.assigned_role == "Botanist")
 			pizza_preferences[noms.ckey] = /obj/item/reagent_containers/food/snacks/pizza/dank
 

code/modules/games/cas.dm

@@ -31,18 +31,17 @@
 	decksize = 50
 	card_text_file = "strings/cas_black.txt"
 
-/obj/item/toy/cards/deck/cas/Initialize()
-	. = ..()
+/obj/item/toy/cards/deck/cas/populate_deck()
 	var/static/list/cards_against_space = list("cas_white" = world.file2list("strings/cas_white.txt"),"cas_black" = world.file2list("strings/cas_black.txt"))
 	allcards = cards_against_space[card_face]
 	var/list/possiblecards = allcards.Copy()
 	if(possiblecards.len < decksize) // sanity check
 		decksize = (possiblecards.len - 1)
 	var/list/randomcards = list()
-	while (randomcards.len < decksize)
+	for(var/x in 1 to decksize)
 		randomcards += pick_n_take(possiblecards)
-	for(var/i=1 to randomcards.len)
-		var/cardtext = randomcards[i]
+	for(var/x in 1 to randomcards.len)
+		var/cardtext = randomcards[x]
 		var/datum/playingcard/P
 		P = new()
 		P.name = "[cardtext]"
@@ -50,7 +49,7 @@
 		cards += P
 	if(!blanks)
 		return
-	for(var/x=1 to blanks)
+	for(var/x in 1 to blanks)
 		var/datum/playingcard/P
 		P = new()
 		P.name = "Blank Card"
@@ -58,10 +57,7 @@
 		cards += P
 	shuffle_inplace(cards) // distribute blank cards throughout deck
 
-/obj/item/toy/cards/deck/cas/attack_hand(mob/user)
-	. = ..()
-	if(.)
-		return
+/obj/item/toy/cards/deck/cas/draw_card(mob/user)
 	if(user.lying)
 		return
 	if(cards.len == 0)

code/modules/jobs/job_types/civilian_chaplain.dm

@@ -24,14 +24,14 @@ Chaplain
 
 	var/obj/item/storage/book/bible/booze/B = new
 
-	if(SSreligion.religion)
-		B.deity_name = SSreligion.deity
-		B.name = SSreligion.bible_name
-		B.icon_state = SSreligion.bible_icon_state
-		B.item_state = SSreligion.bible_item_state
-		to_chat(H, "There is already an established religion onboard the station. You are an acolyte of [SSreligion.deity]. Defer to the Chaplain.")
+	if(GLOB.religion)
+		B.deity_name = GLOB.deity
+		B.name = GLOB.bible_name
+		B.icon_state = GLOB.bible_icon_state
+		B.item_state = GLOB.bible_item_state
+		to_chat(H, "There is already an established religion onboard the station. You are an acolyte of [GLOB.deity]. Defer to the Chaplain.")
 		H.equip_to_slot_or_del(B, SLOT_IN_BACKPACK)
-		var/nrt = SSreligion.holy_weapon_type || /obj/item/nullrod
+		var/nrt = GLOB.holy_weapon_type || /obj/item/nullrod
 		var/obj/item/nullrod/N = new nrt(H)
 		H.put_in_hands(N)
 		return
@@ -74,9 +74,9 @@ Chaplain
 		else
 			B.name = "The Holy Book of [new_religion]"
 
-	SSreligion.religion = new_religion
-	SSreligion.bible_name = B.name
-	SSreligion.deity = B.deity_name
+	GLOB.religion = new_religion
+	GLOB.bible_name = B.name
+	GLOB.deity = B.deity_name
 
 	H.equip_to_slot_or_del(B, SLOT_IN_BACKPACK)
 

code/modules/library/lib_machines.dm

@@ -485,11 +485,11 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
 	if(href_list["printbible"])
 		if(cooldown < world.time)
 			var/obj/item/storage/book/bible/B = new /obj/item/storage/book/bible(src.loc)
-			if(SSreligion.bible_icon_state && SSreligion.bible_item_state)
-				B.icon_state = SSreligion.bible_icon_state
-				B.item_state = SSreligion.bible_item_state
-				B.name = SSreligion.bible_name
-				B.deity_name = SSreligion.deity
+			if(GLOB.bible_icon_state && GLOB.bible_item_state)
+				B.icon_state = GLOB.bible_icon_state
+				B.item_state = GLOB.bible_item_state
+				B.name = GLOB.bible_name
+				B.deity_name = GLOB.deity
 			cooldown = world.time + PRINTER_COOLDOWN
 		else
 			say("Printer currently unavailable, please wait a moment.")

code/modules/mob/dead/new_player/new_player.dm

@@ -164,7 +164,7 @@
 				return
 
 		var/obj/effect/mob_spawn/MS = pick(GLOB.mob_spawners[href_list["JoinAsGhostRole"]])
-		if(istype(MS) && MS.attack_ghost(src, latejoinercalling = TRUE))
+		if(MS?.attack_ghost(src, latejoinercalling = TRUE))
 			SSticker.queued_players -= src
 			SSticker.queue_delay = 4
 			qdel(src)
@@ -443,9 +443,10 @@
 	for(var/datum/job/job in SSjob.occupations)
 		if(job && IsJobUnavailable(job.title, TRUE) == JOB_AVAILABLE)
 			available_job_count++
-	for(var/spawner in GLOB.mob_spawners)
-		available_job_count++
-		break
+	for(var/obj/effect/mob_spawn/spawner in GLOB.mob_spawners)
+		if(spawner.can_latejoin())
+			available_job_count++
+			break
 
 	if(!available_job_count)
 		dat += "<div class='notice red'>There are currently no open positions!</div>"
@@ -464,8 +465,9 @@
 			"Science" = list(jobs = list(), titles = GLOB.science_positions, color = "#e6b3e6"),
 			"Security" = list(jobs = list(), titles = GLOB.security_positions, color = "#ff9999"),
 		)
-		for(var/spawner in GLOB.mob_spawners)
-			categorizedJobs["Ghost Role"]["jobs"] += spawner
+		for(var/obj/effect/mob_spawn/spawner in GLOB.mob_spawners)
+			if(spawner.can_latejoin())
+				categorizedJobs["Ghost Role"]["jobs"] += spawner
 
 		for(var/datum/job/job in SSjob.occupations)
 			if(job && IsJobUnavailable(job.title, TRUE) == JOB_AVAILABLE)

code/modules/mob/dead/new_player/sprite_accessories/socks.dm

@@ -67,6 +67,38 @@
 	name = "Short (White)"
 	icon_state = "white_short"
 
+/datum/sprite_accessory/socks/stockings_blue
+	name = "Stockings (Blue)"
+	icon_state = "stockings_blue"
+
+/datum/sprite_accessory/socks/stockings_cyan
+	name = "Stockings (Cyan)"
+	icon_state = "stockings_cyan"
+
+/datum/sprite_accessory/socks/stockings_dpink
+	name = "Stockings (Dark Pink)"
+	icon_state = "stockings_dpink"
+
+/datum/sprite_accessory/socks/stockings_green
+	name = "Stockings (Green)"
+	icon_state = "stockings_black"
+
+/datum/sprite_accessory/socks/stockings_orange
+	name = "Stockings (Orange)"
+	icon_state = "stockings_orange"
+
+/datum/sprite_accessory/socks/stockings_programmer
+	name = "Stockings (Programmer)"
+	icon_state = "stockings_lpink"
+
+/datum/sprite_accessory/socks/stockings_purple
+	name = "Stockings (Purple)"
+	icon_state = "stockings_purple"
+
+/datum/sprite_accessory/socks/stockings_yellow
+	name = "Stockings (Yellow)"
+	icon_state = "stockings_yellow"
+
 /datum/sprite_accessory/socks/bee_thigh
 	name = "Thigh-high (Bee)"
 	icon_state = "bee_thigh"

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

@@ -44,6 +44,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	var/siemens_coeff = 1 //base electrocution coefficient
 	var/damage_overlay_type = "human" //what kind of damage overlays (if any) appear on our species when wounded?
 	var/fixed_mut_color = "" //to use MUTCOLOR with a fixed color that's independent of dna.feature["mcolor"]
+	var/list/special_step_sounds //Sounds to override barefeet walkng
+	var/grab_sound //Special sound for grabbing
 
 	// species-only traits. Can be found in DNA.dm
 	var/list/species_traits = list()

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

@@ -30,6 +30,7 @@
 	var/list/special_names = list("Tarkus")
 	var/human_surname_chance = 3
 	var/special_name_chance = 5
+	var/owner //dobby is a free golem
 
 /datum/species/golem/random_name(gender,unique,lastname)
 	var/golem_surname = pick(GLOB.golem_names)
@@ -807,3 +808,196 @@
 /datum/species/golem/plastic/on_species_loss(mob/living/carbon/C)
 	. = ..()
 	C.ventcrawler = initial(C.ventcrawler)
+
+/datum/species/golem/bronze
+	name = "Bronze Golem"
+	id = "bronze golem"
+	prefix = "Bronze"
+	special_names = list("Bell")
+	fixed_mut_color = "cd7f32"
+	info_text = "As a <span class='danger'>Bronze Golem</span>, you are very resistant to loud noises, and make loud noises if something hard hits you, however this ability does hurt your hearing."
+	special_step_sounds = list('sound/machines/clockcult/integration_cog_install.ogg', 'sound/magic/clockwork/fellowship_armory.ogg' )
+	attack_verb = "bonk"
+	mutantears = /obj/item/organ/ears/bronze
+	var/last_gong_time = 0
+	var/gong_cooldown = 150
+
+/datum/species/golem/bronze/bullet_act(obj/item/projectile/P, mob/living/carbon/human/H)
+	if(!(world.time > last_gong_time + gong_cooldown))
+		return ..()
+	if(P.flag == "bullet" || P.flag == "bomb")
+		gong(H)
+		return ..()
+
+/datum/species/golem/bronze/spec_hitby(atom/movable/AM, mob/living/carbon/human/H)
+	..()
+	if(world.time > last_gong_time + gong_cooldown)
+		gong(H)
+
+/datum/species/golem/bronze/spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style)
+	..()
+	if(world.time > last_gong_time + gong_cooldown &&  M.a_intent != INTENT_HELP)
+		gong(H)
+
+/datum/species/golem/bronze/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H)
+	..()
+	if(world.time > last_gong_time + gong_cooldown)
+		gong(H)
+
+/datum/species/golem/bronze/on_hit(obj/item/projectile/P, mob/living/carbon/human/H)
+	..()
+	if(world.time > last_gong_time + gong_cooldown)
+		gong(H)
+
+/datum/species/golem/bronze/proc/gong(mob/living/carbon/human/H)
+	last_gong_time = world.time
+	for(var/mob/living/M in get_hearers_in_view(7,H))
+		if(M.stat == DEAD)	//F
+			return
+		if(M == H)
+			H.show_message("<span class='narsiesmall'>You cringe with pain as your body rings around you!</span>", 2)
+			H.playsound_local(H, 'sound/effects/gong.ogg', 100, TRUE)
+			H.soundbang_act(2, 0, 100, 1)
+			H.jitteriness += 7
+		var/distance = max(0,get_dist(get_turf(H),get_turf(M)))
+		switch(distance)
+			if(0 to 1)
+				M.show_message("<span class='narsiesmall'>GONG!</span>", 2)
+				M.playsound_local(H, 'sound/effects/gong.ogg', 100, TRUE)
+				M.soundbang_act(1, 0, 30, 3)
+				M.confused += 10
+				M.jitteriness += 4
+				SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "gonged", /datum/mood_event/loud_gong)
+			if(2 to 3)
+				M.show_message("<span class='cult'>GONG!</span>", 2)
+				M.playsound_local(H, 'sound/effects/gong.ogg', 75, TRUE)
+				M.soundbang_act(1, 0, 15, 2)
+				M.jitteriness += 3
+				SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "gonged", /datum/mood_event/loud_gong)
+			else
+				M.show_message("<span class='warning'>GONG!</span>", 2)
+				M.playsound_local(H, 'sound/effects/gong.ogg', 50, TRUE)
+
+
+/datum/species/golem/cardboard //Faster but weaker, can also make new shells on its own
+	name = "Cardboard Golem"
+	id = "cardboard golem"
+	prefix = "Cardboard"
+	special_names = list("Box")
+	info_text = "As a <span class='danger'>Cardboard Golem</span>, you aren't very strong, but you are a bit quicker and can easily create more brethren by using cardboard on yourself."
+	species_traits = list(NOBLOOD,NO_UNDERWEAR,NOGENITALS,NOAROUSAL,MUTCOLORS)
+	inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOGUNS,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER)
+	fixed_mut_color = "ffffff"
+	limbs_id = "c_golem" //special sprites
+	attack_verb = "bash"
+	armor = 25
+	burnmod = 1.25
+	heatmod = 2
+	speedmod = 1.5
+	punchdamagelow = 4
+	punchstunthreshold = 7
+	punchdamagehigh = 8
+	var/last_creation = 0
+	var/brother_creation_cooldown = 300
+
+/datum/species/golem/cardboard/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H)
+	. = ..()
+	if(user != H)
+		return FALSE //forced reproduction is rape.
+	if(istype(I, /obj/item/stack/sheet/cardboard))
+		var/obj/item/stack/sheet/cardboard/C = I
+		if(last_creation + brother_creation_cooldown > world.time) //no cheesing dork
+			return
+		if(C.amount < 10)
+			to_chat(H, "<span class='warning'>You do not have enough cardboard!</span>")
+			return FALSE
+		to_chat(H, "<span class='notice'>You attempt to create a new cardboard brother.</span>")
+		if(do_after(user, 30, target = user))
+			if(last_creation + brother_creation_cooldown > world.time) //no cheesing dork
+				return
+			if(!C.use(10))
+				to_chat(H, "<span class='warning'>You do not have enough cardboard!</span>")
+				return FALSE
+			to_chat(H, "<span class='notice'>You create a new cardboard golem shell.</span>")
+			create_brother(H.loc)
+
+/datum/species/golem/cardboard/proc/create_brother(var/location)
+	new /obj/effect/mob_spawn/human/golem/servant(location, /datum/species/golem/cardboard, owner)
+	last_creation = world.time
+
+/datum/species/golem/leather
+	name = "Leather Golem"
+	id = "leather golem"
+	special_names = list("Face", "Man", "Belt") //Ah dude 4 strength 4 stam leather belt AHHH
+	inherent_traits = list(TRAIT_NOBREATH, TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOGUNS,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER, TRAIT_STRONG_GRABBER)
+	prefix = "Leather"
+	fixed_mut_color = "624a2e"
+	info_text = "As a <span class='danger'>Leather Golem</span>, you are flammable, but you can grab things with incredible ease, allowing all your grabs to start at a strong level."
+	attack_verb = "whipp"
+	grab_sound = 'sound/weapons/whipgrab.ogg'
+	attack_sound = 'sound/weapons/whip.ogg'
+
+/datum/species/golem/bone
+	name = "Bone Golem"
+	id = "bone golem"
+	say_mod = "rattles"
+	prefix = "Bone"
+	limbs_id = "b_golem"
+	special_names = list("Head", "Broth", "Fracture", "Rattler", "Appetit")
+	liked_food = GROSS | MEAT | RAW
+	toxic_food = null
+	inherent_biotypes = list(MOB_UNDEAD, MOB_HUMANOID)
+	mutanttongue = /obj/item/organ/tongue/bone
+	sexes = FALSE
+	fixed_mut_color = "ffffff"
+	attack_verb = "rattl"
+	species_traits = list(NOBLOOD,NO_UNDERWEAR,NOGENITALS,NOAROUSAL,MUTCOLORS)	
+	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_NOGUNS,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_FAKEDEATH,TRAIT_CALCIUM_HEALER)
+	info_text = "As a <span class='danger'>Bone Golem</span>, You have a powerful spell that lets you chill your enemies with fear, and milk heals you! Just make sure to watch our for bone-hurting juice."
+	var/datum/action/innate/bonechill/bonechill
+
+/datum/species/golem/bone/on_species_gain(mob/living/carbon/C, datum/species/old_species)
+	..()
+	if(ishuman(C))
+		bonechill = new
+		bonechill.Grant(C)
+
+/datum/species/golem/bone/on_species_loss(mob/living/carbon/C)
+	if(bonechill)
+		bonechill.Remove(C)
+	..()
+
+/datum/action/innate/bonechill
+	name = "Bone Chill"
+	desc = "Rattle your bones and strike fear into your enemies!"
+	check_flags = AB_CHECK_CONSCIOUS
+	icon_icon = 'icons/mob/actions/actions_spells.dmi'
+	button_icon_state = "bonechill"
+	var/cooldown = 600
+	var/last_use
+	var/snas_chance = 3
+
+/datum/action/innate/bonechill/Activate()
+	if(world.time < last_use + cooldown)
+		to_chat("<span class='notice'>You aren't ready yet to rattle your bones again</span>")
+		return
+	owner.visible_message("<span class='warning'>[owner] rattles [owner.p_their()] bones harrowingly.</span>", "<span class='notice'>You rattle your bones</span>")
+	last_use = world.time
+	if(prob(snas_chance))
+		playsound(get_turf(owner),'sound/magic/RATTLEMEBONES2.ogg', 100)
+		if(ishuman(owner))
+			var/mob/living/carbon/human/H = owner
+			var/mutable_appearance/badtime = mutable_appearance('icons/mob/human_parts.dmi', "b_golem_eyes", -FIRE_LAYER-0.5)
+			badtime.appearance_flags = RESET_COLOR
+			H.overlays_standing[FIRE_LAYER+0.5] = badtime
+			H.apply_overlay(FIRE_LAYER+0.5)
+			addtimer(CALLBACK(H, /mob/living/carbon/.proc/remove_overlay, FIRE_LAYER+0.5), 25)
+	else
+		playsound(get_turf(owner),'sound/magic/RATTLEMEBONES.ogg', 100)
+	for(var/mob/living/L in orange(7, get_turf(owner)))
+		if((MOB_UNDEAD in L.mob_biotypes) || isgolem(L) || HAS_TRAIT(L, TRAIT_RESISTCOLD))
+			return //Do not affect our brothers
+
+		to_chat(L, "<span class='cultlarge'>A spine-chilling sound chills you to the bone!</span>")
+		L.apply_status_effect(/datum/status_effect/bonechill)
+		SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "spooked", /datum/mood_event/spooked)

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

@@ -5,7 +5,7 @@
 	sexes = 0
 	meat = /obj/item/stack/sheet/mineral/plasma
 	species_traits = list(NOBLOOD,NOTRANSSTING,NOGENITALS)
-	inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_RADIMMUNE,TRAIT_NOHUNGER)
+	inherent_traits = list(TRAIT_RESISTCOLD,TRAIT_RADIMMUNE,TRAIT_NOHUNGER,TRAIT_CALCIUM_HEALER)
 	inherent_biotypes = list(MOB_INORGANIC, MOB_HUMANOID)
 	mutantlungs = /obj/item/organ/lungs/plasmaman
 	mutanttongue = /obj/item/organ/tongue/bone/plasmaman

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

@@ -7,7 +7,7 @@
 	sexes = 0
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
 	species_traits = list(NOBLOOD,NOGENITALS,NOAROUSAL)
-	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_FAKEDEATH)
+	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_FAKEDEATH, TRAIT_CALCIUM_HEALER)
 	inherent_biotypes = list(MOB_UNDEAD, MOB_HUMANOID)
 	mutanttongue = /obj/item/organ/tongue/bone
 	damage_overlay_type = ""//let's not show bloody wounds or burns over bones.
@@ -21,4 +21,4 @@
 
 /datum/species/skeleton/pirate
 	name = "Space Queen's Skeleton"
-	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_FAKEDEATH)
+	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_FAKEDEATH, TRAIT_CALCIUM_HEALER)

code/modules/mob/living/carbon/monkey/combat.dm

@@ -73,39 +73,21 @@
 	if(I.loc == src)
 		return TRUE
 
-	if(I.anchored)
+	if(I.anchored || !put_in_hands(I))
 		blacklistItems[I] ++
 		return FALSE
 
-	// WEAPONS
-	if(istype(I, /obj/item))
-		var/obj/item/W = I
-		if(W.force >= best_force)
-			put_in_hands(W)
-			best_force = W.force
-			return TRUE
-
-	// CLOTHING
-	else if(istype(I, /obj/item/clothing))
-		var/obj/item/clothing/C = I
-		monkeyDrop(C)
-		addtimer(CALLBACK(src, .proc/pickup_and_wear, C), 5)
-		return TRUE
-
-	// EVERYTHING ELSE
+	if(I.force >= best_force)
+		best_force = I.force
 	else
-		if(!get_item_for_held_index(1) || !get_item_for_held_index(2))
-			put_in_hands(I)
-			return TRUE
+		addtimer(CALLBACK(src, .proc/pickup_and_wear, I), 5)
 
-	blacklistItems[I] ++
-	return FALSE
+	return TRUE
 
-/mob/living/carbon/monkey/proc/pickup_and_wear(var/obj/item/clothing/C)
-	if(!equip_to_appropriate_slot(C))
-		monkeyDrop(get_item_by_slot(C)) // remove the existing item if worn
-		sleep(5)
-		equip_to_appropriate_slot(C)
+/mob/living/carbon/monkey/proc/pickup_and_wear(obj/item/I)
+	if(QDELETED(I) || I.loc != src)
+		return
+	equip_to_appropriate_slot(I)
 
 /mob/living/carbon/monkey/resist_restraints()
 	var/obj/item/I = null
@@ -311,7 +293,8 @@
 			if(I == pickupTarget)
 				M.visible_message("<span class='danger'>[src] snatches [pickupTarget] from [M].</span>", "<span class='userdanger'>[src] snatched [pickupTarget]!</span>")
 				if(M.temporarilyRemoveItemFromInventory(pickupTarget) && !QDELETED(pickupTarget))
-					equip_item(pickupTarget)
+					if(!equip_item(pickupTarget))
+						dropItemToGround(pickupTarget)
 				else
 					M.visible_message("<span class='danger'>[src] tried to snatch [pickupTarget] from [M], but failed!</span>", "<span class='userdanger'>[src] tried to grab [pickupTarget]!</span>")
 	pickpocketing = FALSE

code/modules/mob/living/living.dm

@@ -263,7 +263,7 @@
 		var/mob/M = AM
 
 		log_combat(src, M, "grabbed", addition="passive grab")
-		if(!supress_message)
+		if(!supress_message && !(iscarbon(AM) && HAS_TRAIT(src, TRAIT_STRONG_GRABBER)))
 			visible_message("<span class='warning'>[src] has grabbed [M][(zone_selected == "l_arm" || zone_selected == "r_arm")? " by their hands":" passively"]!</span>")		//Cit change - And they thought ERP was bad.
 		if(!iscarbon(src))
 			M.LAssailant = null
@@ -281,6 +281,11 @@
 				var/datum/disease/D = thing
 				if(D.spread_flags & DISEASE_SPREAD_CONTACT_SKIN)
 					ContactContractDisease(D)
+					
+			if(iscarbon(L))
+				var/mob/living/carbon/C = L
+				if(HAS_TRAIT(src, TRAIT_STRONG_GRABBER))
+					C.grippedby(src)
 
 //mob verbs are a lot faster than object verbs
 //for more info on why this is not atom/pull, see examinate() in mob.dm

code/modules/mob/living/silicon/ai/ai.dm

@@ -288,8 +288,17 @@
 
 /mob/living/silicon/ai/can_interact_with(atom/A)
 	. = ..()
+	var/turf/ai = get_turf(src)
+	var/turf/target = get_turf(A)
 	if (.)
 		return
+
+	if(!target)
+		return
+
+	if ((ai.z != target.z) && !is_station_level(ai.z))
+		return FALSE
+
 	if (istype(loc, /obj/item/aicard))
 		var/turf/T0 = get_turf(src)
 		var/turf/T1 = get_turf(A)

code/modules/paperwork/paperplane.dm

@@ -1,4 +1,4 @@
-    
+
 /obj/item/paperplane
 	name = "paper plane"
 	desc = "Paper, folded in the shape of a plane."
@@ -122,7 +122,7 @@
 	to_chat(user, "<span class='notice'>Alt-click [src] to fold it into a paper plane.</span>")
 
 /obj/item/paper/AltClick(mob/living/carbon/user, obj/item/I)
-	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user), NO_TK))
 		return
 	to_chat(user, "<span class='notice'>You fold [src] into the shape of a plane!</span>")
 	user.temporarilyRemoveItemFromInventory(src)

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -51,7 +51,8 @@
 //these become available once upgraded.
 	var/list/upgrade_reagents = list(
 		"oil",
-		"ammonia"
+		"ammonia",
+		"ash"
 	)
 
 	var/list/upgrade_reagents2 = list(
@@ -248,13 +249,8 @@
 				work_animation()
 				. = TRUE
 		if("eject")
-			if(beaker)
-				beaker.forceMove(drop_location())
-				if(Adjacent(usr) && !issilicon(usr))
-					usr.put_in_hands(beaker)
-				beaker = null
-				update_icon()
-				. = TRUE
+			replace_beaker(usr)
+			. = TRUE //no afterattack
 		if("dispense_recipe")
 			if(!is_operational() || QDELETED(cell))
 				return
@@ -267,7 +263,7 @@
 				if(beaker && dispensable_reagents.Find(r_id)) // but since we verify we have the reagent, it'll be fine
 					var/datum/reagents/R = beaker.reagents
 					var/free = R.maximum_volume - R.total_volume
-					var/actual = min(round(chemicals_to_dispense[key], res), (cell.charge * powerefficiency)*10, free)
+					var/actual = min(max(chemicals_to_dispense[key], res), (cell.charge * powerefficiency)*10, free)
 					if(actual)
 						if(!cell.use(actual / powerefficiency))
 							say("Not enough energy to complete operation!")
@@ -320,14 +316,12 @@
 		return
 	if(istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container())
 		var/obj/item/reagent_containers/B = I
-		. = 1 //no afterattack
-		if(beaker)
-			to_chat(user, "<span class='warning'>A container is already loaded into [src]!</span>")
-			return
+		. = TRUE //no afterattack
 		if(!user.transferItemToLoc(B, src))
 			return
-		beaker = B
+		replace_beaker(user, B)
 		to_chat(user, "<span class='notice'>You add [B] to [src].</span>")
+		updateUsrDialog()
 		update_icon()
 	else if(user.a_intent != INTENT_HARM && !istype(I, /obj/item/card/emag))
 		to_chat(user, "<span class='warning'>You can't load [I] into [src]!</span>")
@@ -379,7 +373,17 @@
 			dispensable_reagents |= upgrade_reagents3
 	powerefficiency = round(newpowereff, 0.01)
 
-
+/obj/machinery/chem_dispenser/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
+	if(beaker)
+		beaker.forceMove(drop_location())
+		if(user && Adjacent(user) && !issiliconoradminghost(user))
+			user.put_in_hands(beaker)
+	if(new_beaker)
+		beaker = new_beaker
+	else
+		beaker = null
+	update_icon()
+	return TRUE
 
 /obj/machinery/chem_dispenser/on_deconstruction()
 	cell = null
@@ -415,6 +419,12 @@
 		final_list += list(avoid_assoc_duplicate_keys(fuck[1],key_list) = text2num(fuck[2]))
 	return final_list
 
+/obj/machinery/chem_dispenser/AltClick(mob/living/user)
+	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		return
+	replace_beaker(user)
+	return
+
 /obj/machinery/chem_dispenser/drinks/Initialize()
 	. = ..()
 	AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE)
@@ -478,9 +488,16 @@
 		"tomatojuice",
 		"lemonjuice",
 		"menthol"
-	) //prevents the soda machine from obtaining chemical upgrades. .
-	upgrade_reagents = null
-	upgrade_reagents2 = null
+	)
+	upgrade_reagents = list(
+		"mushroomhallucinogen",
+		"nothing",
+		"cryoxadone"
+	)
+	upgrade_reagents2 = list(
+		"banana",
+		"berryjuice"
+	)
 	upgrade_reagents3 = null
 	emagged_reagents = list(
 		"thirteenloko",
@@ -534,18 +551,19 @@
 		"triple_sec",
 		"sake",
 		"applejack"
-	)//prevents the booze machine from obtaining chemical upgrades.
-	upgrade_reagents = null
+	)
+	upgrade_reagents = list(
+		"ethanol",
+		"fernet"
+	)
 	upgrade_reagents2 = null
 	upgrade_reagents3 = null
 	emagged_reagents = list(
-		"ethanol",
 		"iron",
 		"alexander",
 		"clownstears",
 		"minttoxin",
 		"atomicbomb",
-		"fernet",
 		"aphro",
 		"aphro+"
 	)

code/modules/reagents/chemistry/machinery/chem_heater.dm

@@ -28,13 +28,23 @@
 	else
 		icon_state = "mixer0b"
 
-/obj/machinery/chem_heater/proc/eject_beaker(mob/user)
+/obj/machinery/chem_heater/AltClick(mob/living/user)
+	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		return
+	replace_beaker(user)
+	return
+
+/obj/machinery/chem_heater/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
 	if(beaker)
 		beaker.forceMove(drop_location())
-		if(Adjacent(user) && !issilicon(user))
+		if(user && Adjacent(user) && !issiliconoradminghost(user))
 			user.put_in_hands(beaker)
+	if(new_beaker)
+		beaker = new_beaker
+	else
 		beaker = null
 		update_icon()
+		return TRUE
 
 /obj/machinery/chem_heater/RefreshParts()
 	heater_coefficient = 0.1
@@ -58,21 +68,19 @@
 		return
 
 	if(istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container())
-		. = 1 //no afterattack
-		if(beaker)
-			to_chat(user, "<span class='warning'>A container is already loaded into [src]!</span>")
+		. = TRUE //no afterattack
+		var/obj/item/reagent_containers/B = I
+		if(!user.transferItemToLoc(B, src))
 			return
-
-		if(!user.transferItemToLoc(I, src))
-			return
-		beaker = I
-		to_chat(user, "<span class='notice'>You add [I] to [src].</span>")
+		replace_beaker(user, B)
+		to_chat(user, "<span class='notice'>You add [B] to [src].</span>")
+		updateUsrDialog()
 		update_icon()
 		return
 	return ..()
 
 /obj/machinery/chem_heater/on_deconstruction()
-	eject_beaker()
+	replace_beaker()
 	return ..()
 
 /obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
@@ -122,5 +130,5 @@
 				target_temperature = CLAMP(target, 0, 1000)
 		if("eject")
 			on = FALSE
-			eject_beaker(usr)
+			replace_beaker(usr)
 			. = TRUE

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -60,16 +60,6 @@
 	else
 		icon_state = "mixer0"
 
-/obj/machinery/chem_master/proc/eject_beaker(mob/user)
-	if(beaker)
-		beaker.forceMove(drop_location())
-		if(Adjacent(user) && !issilicon(user))
-			user.put_in_hands(beaker)
-		else
-			adjust_item_drop_location(beaker)
-		beaker = null
-		update_icon()
-
 /obj/machinery/chem_master/blob_act(obj/structure/blob/B)
 	if (prob(50))
 		qdel(src)
@@ -85,36 +75,49 @@
 		return
 
 	if(istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container())
-		. = 1 // no afterattack
+		. = TRUE // no afterattack
 		if(panel_open)
 			to_chat(user, "<span class='warning'>You can't use the [src.name] while its panel is opened!</span>")
 			return
-		if(beaker)
-			to_chat(user, "<span class='warning'>A container is already loaded into [src]!</span>")
+		var/obj/item/reagent_containers/B = I
+		if(!user.transferItemToLoc(B, src))
 			return
-		if(!user.transferItemToLoc(I, src))
-			return
-
-		beaker = I
-		to_chat(user, "<span class='notice'>You add [I] to [src].</span>")
-		src.updateUsrDialog()
+		replace_beaker(user, B)
+		to_chat(user, "<span class='notice'>You add [B] to [src].</span>")
+		updateUsrDialog()
 		update_icon()
-
 	else if(!condi && istype(I, /obj/item/storage/pill_bottle))
 		if(bottle)
 			to_chat(user, "<span class='warning'>A pill bottle is already loaded into [src]!</span>")
 			return
 		if(!user.transferItemToLoc(I, src))
 			return
-
 		bottle = I
 		to_chat(user, "<span class='notice'>You add [I] into the dispenser slot.</span>")
-		src.updateUsrDialog()
+		updateUsrDialog()
 	else
 		return ..()
 
+/obj/machinery/chem_master/AltClick(mob/living/user)
+	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		return
+	replace_beaker(user)
+	return
+
+/obj/machinery/chem_master/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
+	if(beaker)
+		beaker.forceMove(drop_location())
+		if(user && Adjacent(user) && !issiliconoradminghost(user))
+			user.put_in_hands(beaker)
+	if(new_beaker)
+		beaker = new_beaker
+	else
+		beaker = null
+	update_icon()
+	return TRUE
+
 /obj/machinery/chem_master/on_deconstruction()
-	eject_beaker()
+	replace_beaker(usr)
 	if(bottle)
 		bottle.forceMove(drop_location())
 		adjust_item_drop_location(bottle)
@@ -164,7 +167,7 @@
 		return
 	switch(action)
 		if("eject")
-			eject_beaker(usr)
+			replace_beaker(usr)
 			. = TRUE
 
 		if("ejectp")

code/modules/reagents/chemistry/machinery/reagentgrinder.dm

@@ -19,6 +19,12 @@
 	var/speed = 1
 	var/list/holdingitems
 
+	var/static/radial_examine = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_examine")
+	var/static/radial_eject = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_eject")
+	var/static/radial_grind = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_grind")
+	var/static/radial_juice = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_juice")
+	var/static/radial_mix = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_mix")
+
 /obj/machinery/reagentgrinder/Initialize()
 	. = ..()
 	holdingitems = list()
@@ -51,7 +57,6 @@
 	if(A == beaker)
 		beaker = null
 		update_icon()
-		updateUsrDialog()
 	if(holdingitems[A])
 		holdingitems -= A
 
@@ -67,6 +72,18 @@
 	else
 		icon_state = "juicer0"
 
+/obj/machinery/reagentgrinder/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
+	if(beaker)
+		beaker.forceMove(drop_location())
+		if(user && Adjacent(user) && !issiliconoradminghost(user))
+			user.put_in_hands(beaker)
+	if(new_beaker)
+		beaker = new_beaker
+	else
+		beaker = null
+	update_icon()
+	return TRUE
+
 /obj/machinery/reagentgrinder/attackby(obj/item/I, mob/user, params)
 	//You can only screw open empty grinder
 	if(!beaker && !length(holdingitems) && default_deconstruction_screwdriver(user, icon_state, icon_state, I))
@@ -82,17 +99,14 @@
 		return TRUE
 
 	if (istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container())
-		if (!beaker)
-			if(!user.transferItemToLoc(I, src))
-				to_chat(user, "<span class='warning'>[I] is stuck to your hand!</span>")
-				return TRUE
-			to_chat(user, "<span class='notice'>You slide [I] into [src].</span>")
-			beaker = I
-			update_icon()
-			updateUsrDialog()
-		else
-			to_chat(user, "<span class='warning'>There's already a container inside [src].</span>")
-		return TRUE //no afterattack
+		var/obj/item/reagent_containers/B = I
+		. = TRUE
+		if(!user.transferItemToLoc(B, src))
+			return
+		replace_beaker(user, B)
+		to_chat(user, "<span class='notice'>You add [B] to [src].</span>")
+		update_icon()
+		return
 
 	if(holdingitems.len >= limit)
 		to_chat(user, "<span class='warning'>[src] is filled to capacity!</span>")
@@ -108,8 +122,6 @@
 				to_chat(user, "<span class='notice'>You empty [I] into [src].</span>")
 			else
 				to_chat(user, "<span class='notice'>You fill [src] to the brim.</span>")
-
-		updateUsrDialog()
 		return TRUE
 
 	if(!I.grind_results && !I.juice_results)
@@ -125,104 +137,89 @@
 	if(user.transferItemToLoc(I, src))
 		to_chat(user, "<span class='notice'>You add [I] to [src].</span>")
 		holdingitems[I] = TRUE
-		updateUsrDialog()
 		return FALSE
 
 /obj/machinery/reagentgrinder/ui_interact(mob/user) // The microwave Menu //I am reasonably certain that this is not a microwave
 	. = ..()
-	var/is_chamber_empty = FALSE
-	var/is_beaker_ready = FALSE
-	var/processing_chamber = ""
-	var/beaker_contents = ""
-	var/dat = ""
 
-	if(!operating)
-		for (var/i in holdingitems)
-			var/obj/item/O = i
-			processing_chamber += "\A [O.name]<BR>"
+	if(operating || !user.canUseTopic(src, !issilicon(user)))
+		return
 
-		if (!processing_chamber)
-			is_chamber_empty = TRUE
-			processing_chamber = "Nothing."
-		if (!beaker)
-			beaker_contents = "<B>No beaker attached.</B><br>"
-		else
-			is_beaker_ready = TRUE
-			beaker_contents = "<B>The beaker contains:</B><br>"
-			var/anything = FALSE
-			for(var/datum/reagent/R in beaker.reagents.reagent_list)
-				anything = TRUE
-				beaker_contents += "[R.volume] - [R.name]<br>"
-			if(!anything)
-				beaker_contents += "Nothing<br>"
+	var/list/options = list()
 
-		dat = {"
-	<b>Processing chamber contains:</b><br>
-	[processing_chamber]<br>
-	[beaker_contents]<hr>
-	"}
-		if (is_beaker_ready)
-			if(!is_chamber_empty && !(stat & (NOPOWER|BROKEN)))
-				dat += "<A href='?src=[REF(src)];action=grind'>Grind the reagents</a><BR>"
-				dat += "<A href='?src=[REF(src)];action=juice'>Juice the reagents</a><BR><BR>"
-			else if (beaker.reagents.total_volume)
-				dat += "<A href='?src=[REF(src)];action=mix'>Mix the reagents</a><BR><BR>"
-		if(length(holdingitems))
-			dat += "<A href='?src=[REF(src)];action=eject'>Eject the reagents</a><BR>"
-		if(beaker)
-			dat += "<A href='?src=[REF(src)];action=detach'>Detach the beaker</a><BR>"
+	if(beaker || length(holdingitems))
+		options["eject"] = radial_eject
+
+	if(isAI(user))
+		if(stat & NOPOWER)
+			return
+		options["examine"] = radial_examine
+
+	// if there is no power or it's broken, the procs will fail but the buttons will still show
+	if(length(holdingitems))
+		options["grind"] = radial_grind
+		options["juice"] = radial_juice
+	else if(beaker?.reagents.total_volume)
+		options["mix"] = radial_mix
+
+	var/choice
+
+	if(length(options) < 1)
+		return
+	if(length(options) == 1)
+		for(var/key in options)
+			choice = key
 	else
-		dat += "Please wait..."
+		choice = show_radial_menu(user, src, options, require_near = !issilicon(user))
 
-	var/datum/browser/popup = new(user, "reagentgrinder", "All-In-One Grinder")
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
-	popup.open(1)
-	return
+	// post choice verification
+	if(operating || (isAI(user) && stat & NOPOWER) || !user.canUseTopic(src, !issilicon(user)))
+		return
 
-/obj/machinery/reagentgrinder/Topic(href, href_list)
-	if(..())
-		return
-	var/mob/user = usr
-	if(!user.canUseTopic(src))
-		return
-	if(stat & (NOPOWER|BROKEN))
-		return
-	user.set_machine(src)
-	if(operating)
-		updateUsrDialog()
-		return
-	switch(href_list["action"])
-		if ("grind")
+	switch(choice)
+		if("eject")
+			eject(user)
+		if("grind")
 			grind(user)
 		if("juice")
 			juice(user)
 		if("mix")
 			mix(user)
-		if("eject")
-			eject(user)
-		if("detach")
-			detach(user)
-	updateUsrDialog()
+		if("examine")
+			examine(user)
 
-/obj/machinery/reagentgrinder/proc/detach(mob/user)
-	if(!beaker)
+/obj/machinery/reagentgrinder/examine(mob/user)
+	. = ..()
+	if(!in_range(user, src) && !issilicon(user) && !isobserver(user))
+		to_chat(user, "<span class='warning'>You're too far away to examine [src]'s contents and display!</span>")
 		return
-	beaker.forceMove(drop_location())
-	if(Adjacent(user) && !issilicon(user))
-		user.put_in_hands(beaker)
-	beaker = null
-	update_icon()
-	updateUsrDialog()
+
+	if(operating)
+		to_chat(user, "<span class='warning'>\The [src] is operating.</span>")
+		return
+
+	if(beaker || length(holdingitems))
+		to_chat(user, "<span class='notice'>\The [src] contains:</span>")
+		if(beaker)
+			to_chat(user, "<span class='notice'>- \A [beaker].</span>")
+		for(var/i in holdingitems)
+			var/obj/item/O = i
+			to_chat(user, "<span class='notice'>- \A [O.name].</span>")
+
+	if(!(stat & (NOPOWER|BROKEN)))
+		to_chat(user, "<span class='notice'>The status display reads:</span>")
+		to_chat(user, "<span class='notice'>- Grinding reagents at <b>[speed*100]%</b>.<span>")
+		if(beaker)
+			for(var/datum/reagent/R in beaker.reagents.reagent_list)
+				to_chat(user, "<span class='notice'>- [R.volume] units of [R.name].</span>")
 
 /obj/machinery/reagentgrinder/proc/eject(mob/user)
-	if(!length(holdingitems))
-		return
 	for(var/i in holdingitems)
 		var/obj/item/O = i
 		O.forceMove(drop_location())
 		holdingitems -= O
-	updateUsrDialog()
+	if(beaker)
+		replace_beaker(user)
 
 /obj/machinery/reagentgrinder/proc/remove_object(obj/item/O)
 	holdingitems -= O
@@ -240,7 +237,6 @@
 
 /obj/machinery/reagentgrinder/proc/operate_for(time, silent = FALSE, juicing = FALSE)
 	shake_for(time / speed)
-	updateUsrDialog()
 	operating = TRUE
 	if(!silent)
 		if(!juicing)
@@ -251,11 +247,10 @@
 
 /obj/machinery/reagentgrinder/proc/stop_operating()
 	operating = FALSE
-	updateUsrDialog()
 
 /obj/machinery/reagentgrinder/proc/juice()
 	power_change()
-	if(!beaker || (beaker && (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)))
+	if(!beaker || stat & (NOPOWER|BROKEN) || beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 		return
 	operate_for(50, juicing = TRUE)
 	for(var/obj/item/i in holdingitems)
@@ -274,7 +269,7 @@
 
 /obj/machinery/reagentgrinder/proc/grind()
 	power_change()
-	if(!beaker || (beaker && beaker.reagents.total_volume >= beaker.reagents.maximum_volume))
+	if(!beaker || stat & (NOPOWER|BROKEN) || beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
 		return
 	operate_for(60)
 	for(var/i in holdingitems)
@@ -296,13 +291,13 @@
 /obj/machinery/reagentgrinder/proc/mix(mob/user)
 	//For butter and other things that would change upon shaking or mixing
 	power_change()
-	if(!beaker)
+	if(!beaker || stat & (NOPOWER|BROKEN))
 		return
 	operate_for(50, juicing = TRUE)
 	addtimer(CALLBACK(src, /obj/machinery/reagentgrinder/proc/mix_complete), 50)
 
 /obj/machinery/reagentgrinder/proc/mix_complete()
-	if(beaker && beaker.reagents.total_volume)
+	if(beaker?.reagents.total_volume)
 		//Recipe to make Butter
 		var/butter_amt = FLOOR(beaker.reagents.get_reagent_amount("milk") / MILK_TO_BUTTER_COEFF, 1)
 		beaker.reagents.remove_reagent("milk", MILK_TO_BUTTER_COEFF * butter_amt)

code/modules/reagents/chemistry/reagents/drink_reagents.dm

@@ -213,15 +213,15 @@
 	glass_desc = "White and nutritious goodness!"
 
 /datum/reagent/consumable/milk/on_mob_life(mob/living/carbon/M)
-	if(M.getBruteLoss() && prob(20))
-		M.heal_bodypart_damage(1,0, 0)
+	if(HAS_TRAIT(M, TRAIT_CALCIUM_HEALER))
+		M.heal_bodypart_damage(1.5,0, 0)
 		. = 1
+	else
+		if(M.getBruteLoss() && prob(20))
+			M.heal_bodypart_damage(1,0, 0)
+			. = 1
 	if(holder.has_reagent("capsaicin"))
 		holder.remove_reagent("capsaicin", 2)
-	var/datum/dna/Mdna = M.has_dna()
-	if(Mdna && Mdna.species && (Mdna.species.id == "plasmaman" || Mdna.species.id == "skeleton"))
-		M.heal_bodypart_damage(1,0, 0)
-		. = 1
 	..()
 
 /datum/reagent/consumable/soymilk

code/modules/reagents/chemistry/reagents/toxin_reagents.dm

@@ -887,3 +887,64 @@
 
 /datum/reagent/toxin/mimesbane/on_mob_end_metabolize(mob/living/L)
 	REMOVE_TRAIT(L, TRAIT_EMOTEMUTE, id)
+
+/datum/reagent/toxin/bonehurtingjuice //oof ouch
+	name = "Bone Hurting Juice"
+	id = "bonehurtingjuice"
+	description = "A strange substance that looks a lot like water. Drinking it is oddly tempting. Oof ouch."
+	color = "#AAAAAA77" //RGBA: 170, 170, 170, 77
+	toxpwr = 0
+	taste_description = "bone hurting"
+	overdose_threshold = 20
+
+/datum/reagent/toxin/bonehurtingjuice/on_mob_add(mob/living/carbon/M)
+	M.say("oof ouch my bones", forced = /datum/reagent/toxin/bonehurtingjuice)
+
+/datum/reagent/toxin/bonehurtingjuice/on_mob_life(mob/living/carbon/M)
+	M.adjustStaminaLoss(7.5, 0)
+	if(HAS_TRAIT(M, TRAIT_CALCIUM_HEALER))
+		M.adjustBruteLoss(3.5, 0)
+	if(prob(12))
+		switch(rand(1, 3))
+			if(1)
+				var/list/possible_says = list("oof.", "ouch!", "my bones.", "oof ouch.", "oof ouch my bones.")
+				M.say(pick(possible_says), forced = /datum/reagent/toxin/bonehurtingjuice)
+			if(2)
+				var/list/possible_mes = list("oofs softly.", "looks like their bones hurt.", "grimaces, as though their bones hurt.")
+				M.say("*custom " + pick(possible_mes), forced = /datum/reagent/toxin/bonehurtingjuice)
+			if(3)
+				to_chat(M, "<span class='warning'>Your bones hurt!</span>")
+	return ..()
+
+/datum/reagent/toxin/bonehurtingjuice/overdose_process(mob/living/carbon/M)
+	if(prob(6) && iscarbon(M)) //big oof
+		var/selected_part
+		switch(rand(1, 4)) //God help you if the same limb gets picked twice quickly.
+			if(1)
+				selected_part = BODY_ZONE_L_ARM
+			if(2)
+				selected_part = BODY_ZONE_R_ARM
+			if(3)
+				selected_part = BODY_ZONE_L_LEG
+			if(4)
+				selected_part = BODY_ZONE_R_LEG
+		var/obj/item/bodypart/bp = M.get_bodypart(selected_part)
+		if(M.dna.species.type != /datum/species/skeleton || M.dna.species.type != /datum/species/plasmaman || M.dna.species.type != /datum/species/golem/bone) //We're so sorry skeletons, you're so misunderstood
+			if(bp)
+				bp.receive_damage(0, 0, 200)
+				playsound(M, get_sfx("desceration"), 50, TRUE, -1)
+				M.visible_message("<span class='warning'>[M]'s bones hurt too much!!</span>", "<span class='danger'>Your bones hurt too much!!</span>")
+				M.say("OOF!!", forced = /datum/reagent/toxin/bonehurtingjuice)
+			else //SUCH A LUST FOR REVENGE!!!
+				to_chat(M, "<span class='warning'>A phantom limb hurts!</span>")
+				M.say("Why are we still here, just to suffer?", forced = /datum/reagent/toxin/bonehurtingjuice)
+		else //you just want to socialize
+			if(bp)
+				playsound(M, get_sfx("desceration"), 50, TRUE, -1)
+				M.visible_message("<span class='warning'>[M] rattles loudly and flails around!!</span>", "<span class='danger'>Your bones hurt so much that your missing muscles spasm!!</span>")
+				M.say("OOF!!", forced=/datum/reagent/toxin/bonehurtingjuice)
+				bp.receive_damage(200, 0, 0) //But I don't think we should
+			else
+				to_chat(M, "<span class='warning'>Your missing arm aches from wherever you left it.</span>")
+				M.emote("sigh")
+	return ..()

code/modules/reagents/chemistry/recipes/pyrotechnics.dm

@@ -64,8 +64,8 @@
 		strengthdiv = 8
 		for(var/mob/living/simple_animal/revenant/R in get_hearers_in_view(7,get_turf(holder.my_atom)))
 			var/deity
-			if(SSreligion.deity)
-				deity = SSreligion.deity
+			if(GLOB.deity)
+				deity = GLOB.deity
 			else
 				deity = "Christ"
 			to_chat(R, "<span class='userdanger'>The power of [deity] compels you!</span>")

code/modules/reagents/chemistry/recipes/toxins.dm

@@ -119,3 +119,10 @@
 	id = "mimesbane"
 	results = list("mimesbane" = 3)
 	required_reagents = list("radium" = 1, "mutetoxin" = 1, "nothing" = 1)
+
+/datum/chemical_reaction/bonehurtingjuice
+	name = "Bone Hurting Juice"
+	id = "bonehurtingjuice"
+	results = list("bonehurtingjuice" = 5)
+	required_reagents = list("mutagen" = 1, "itching_powder" = 3, "milk" = 1)
+	mix_message = "<span class='danger'>The mixture suddenly becomes clear and looks a lot like water. You feel a strong urge to drink it.</span>"

code/modules/research/designs/comp_board_designs/comp_board_designs_all_misc.dm

@@ -21,6 +21,14 @@
 	category = list("Computer Boards")
 	departmental_flags = DEPARTMENTAL_FLAG_ALL
 
+/datum/design/board/minesweeper
+	name = "Computer Design (Minesweeper Arcade Machine)"
+	desc = "Allows for the construction of circuit boards used to build a new Minesweeper machine."
+	id = "arcade_minesweeper"
+	build_path = /obj/item/circuitboard/computer/arcade/minesweeper
+	category = list("Computer Boards")
+	departmental_flags = DEPARTMENTAL_FLAG_ALL
+
 /datum/design/board/slot_machine
 	name = "Computer Design (Slot Machine)"
 	desc = "Allows for the construction of circuit boards used to build a new slot machine."

code/modules/ruins/lavaland_ruin_code.dm

@@ -81,7 +81,11 @@
 		/obj/item/stack/sheet/cloth	                = /datum/species/golem/cloth,
 		/obj/item/stack/sheet/mineral/adamantine	= /datum/species/golem/adamantine,
 		/obj/item/stack/sheet/plastic	            = /datum/species/golem/plastic,
-		/obj/item/stack/tile/brass					= /datum/species/golem/clockwork)
+		/obj/item/stack/tile/brass					= /datum/species/golem/clockwork,
+		/obj/item/stack/tile/bronze					= /datum/species/golem/bronze,
+		/obj/item/stack/sheet/cardboard				= /datum/species/golem/cardboard,
+		/obj/item/stack/sheet/leather				= /datum/species/golem/leather,
+		/obj/item/stack/sheet/bone					= /datum/species/golem/bone)
 
 	if(istype(I, /obj/item/stack))
 		var/obj/item/stack/O = I

code/modules/surgery/organs/ears.dm

@@ -94,3 +94,9 @@
 		H.dna.features["ears"] = "None"
 		H.dna.species.mutant_bodyparts -= "ears"
 		H.update_body()
+
+/obj/item/organ/ears/bronze
+	name = "tin ears"
+	desc = "The robust ears of a bronze golem. "
+	damage_multiplier = 0.1 //STRONK
+	bang_protect = 1 //Fear me weaklings. 

code/modules/uplink/uplink_items.dm

@@ -1785,10 +1785,10 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
 	desc = "Nothing is more terrifying than clowns with fully automatic weaponry."
 	item = /obj/item/storage/backpack/duffelbag/clown/syndie
 
-/datum/uplink_item/badass/durasteel_toolbox
-	name = "Durasteel Toolbox"
+/datum/uplink_item/badass/plastitanium_toolbox
+	name = "Plastitanium Toolbox"
 	desc = "A very high impact toolbox. Excels at destroying stationary structures."
-	item = /obj/item/storage/toolbox/durasteel
+	item = /obj/item/storage/toolbox/plastitanium
 	cost = 2		//18 damage on mobs, 50 on objects, 4.5 stam/hit
 
 /datum/uplink_item/badass/balloon