Merge branch 'master' into outfiterinos

code/modules/admin/admin_verbs.dm

@@ -89,7 +89,8 @@ var/list/admin_verbs_sounds = list(
 	/client/proc/play_local_sound,
 	/client/proc/play_sound,
 	/client/proc/play_server_sound,
-	/client/proc/play_intercomm_sound
+	/client/proc/play_intercomm_sound,
+	/client/proc/stop_global_admin_sounds
 	)
 var/list/admin_verbs_event = list(
 	/client/proc/object_talk,
@@ -553,7 +554,7 @@ var/list/admin_verbs_snpc = list(
 
 	var/turf/epicenter = mob.loc
 	var/list/choices = list("Small Bomb", "Medium Bomb", "Big Bomb", "Custom Bomb")
-	var/choice = input("What size explosion would you like to produce?") in choices
+	var/choice = input("What size explosion would you like to produce?") as null|anything in choices
 	switch(choice)
 		if(null)
 			return 0
@@ -989,12 +990,12 @@ var/list/admin_verbs_snpc = list(
 	verbs -= admin_verbs_snpc
 	verbs += /client/proc/show_snpc_verbs
 	to_chat(src, "<span class='interface'>SNPC verbs have been toggled off.</span>")
-	
+
 /client/proc/toggle_advanced_interaction()
 	set name = "Toggle Advanced Admin Interaction"
 	set category = "Admin"
 	set desc = "Allows you to interact with atoms such as buttons and doors, on top of regular machinery interaction."
-	
+
 	if(!check_rights(R_ADMIN))
 		return
 

code/modules/admin/verbs/adminhelp.dm

@@ -109,13 +109,13 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 
 	switch(selected_type)
 		if("Mentorhelp")
-			msg = "<span class='mentorhelp'>[selected_type]: </span><span class='boldnotice'>[key_name(src, 1, 1, selected_type)] (<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[mob.UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) ([admin_jump_link(mob)]) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>) (<A HREF='?_src_=holder;rejectadminhelp=[ref_client]'>REJT</A>) [ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""]  (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=holder;take_question=[mob.UID()];is_mhelp=1'>TAKE</A>) :</span> <span class='mentorhelp'>[msg]</span>"
+			msg = "<span class='mentorhelp'>[selected_type]: </span><span class='boldnotice'>[key_name(src, 1, 1, selected_type)] (<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[mob.UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) ([admin_jump_link(mob)]) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>) (<A HREF='?_src_=holder;rejectadminhelp=[ref_client]'>REJT</A>) [ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""] (<A HREF='?_src_=holder;take_question=[mob.UID()];is_mhelp=1'>TAKE</A>) :</span> <span class='mentorhelp'>[msg]</span>"
 			for(var/client/X in mentorholders + modholders + adminholders)
 				if(X.prefs.sound & SOUND_ADMINHELP)
 					X << 'sound/effects/adminhelp.ogg'
 				to_chat(X, msg)
 		if("Adminhelp")
-			msg = "<span class='adminhelp'>[selected_type]: </span><span class='boldnotice'>[key_name(src, 1, 1, selected_type)] (<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[mob.UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) ([admin_jump_link(mob)]) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>) (<A HREF='?_src_=holder;rejectadminhelp=[ref_client]'>REJT</A>) [ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""] (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=holder;take_question=[mob.UID()]'>TAKE</A>) :</span> <span class='adminhelp'>[msg]</span>"
+			msg = "<span class='adminhelp'>[selected_type]: </span><span class='boldnotice'>[key_name(src, 1, 1, selected_type)] (<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[mob.UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) ([admin_jump_link(mob)]) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>) (<A HREF='?_src_=holder;rejectadminhelp=[ref_client]'>REJT</A>) [ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""] (<A HREF='?_src_=holder;take_question=[mob.UID()]'>TAKE</A>) :</span> <span class='adminhelp'>[msg]</span>"
 			for(var/client/X in modholders + adminholders)
 				if(X.prefs.sound & SOUND_ADMINHELP)
 					X << 'sound/effects/adminhelp.ogg'

code/modules/admin/verbs/playsound.dm

@@ -1,5 +1,18 @@
 var/list/sounds_cache = list()
 
+/client/proc/stop_global_admin_sounds()
+	set category = "Event"
+	set name = "Stop Global Admin Sounds"
+	if(!check_rights(R_SOUNDS))
+		return
+
+	var/sound/awful_sound = sound(null, repeat = 0, wait = 0, channel = 777)
+
+	log_admin("[key_name(src)] stopped admin sounds.")
+	message_admins("[key_name_admin(src)] stopped admin sounds.", 1)
+	for(var/mob/M in player_list)
+		M << awful_sound
+
 /client/proc/play_sound(S as sound)
 	set category = "Event"
 	set name = "Play Global Sound"

code/modules/admin/verbs/randomverbs.dm

@@ -549,9 +549,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	var/type = input(usr, "Pick a type of report to send", "Report Type", "") as anything in MsgType
 	var/input = input(usr, "Please enter anything you want. Anything. Serious.", "What?", "") as message|null
-	var/customname = input(usr, "Pick a title for the report.", "Title") as text|null
 	if(!input)
 		return
+	var/customname = input(usr, "Pick a title for the report.", "Title") as text|null
+	if(!customname)
+		return
 
 	if(type == "Enemy Communications")
 		if(!customname)
@@ -560,11 +562,13 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		var/from = input(usr, "What kind of report? Example: Syndicate Communique", "From") as text|null
 		if(!from)
 			from = "Syndicate Communique"
-		switch(alert("Should this be announced to the general population?",,"Yes","No"))
+		switch(alert("Should this be announced to the general population?",,"Yes","No", "Cancel"))
 			if("Yes")
 				communications_announcement.Announce(input, customname, , , , from);
-			if("No")
+			else if("No")
 				to_chat(world, "<span class='danger'>[from] available at all communications consoles.</span>")
+			else
+				return
 
 		print_command_report(input, from)
 
@@ -918,4 +922,4 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	for(var/datum/station_goal/S in ticker.mode.station_goals)
 		dat += "[S.name] - <a href='?src=[S.UID()];announce=1'>Announce</a> | <a href='?src=[S.UID()];remove=1'>Remove</a><br>"
 	dat += "<br><a href='?src=[UID()];add_station_goal=1'>Add New Goal</a>"
-	usr << browse(dat, "window=goals;size=400x400")
+	usr << browse(dat, "window=goals;size=400x400")

code/modules/awaymissions/mission_code/spacehotel.dm

@@ -92,8 +92,8 @@
 	icon = 'icons/obj/doors/Doorsand.dmi'
 	icon_state = "door_closed"
 	autoclose = 1
-	var/doorOpen = 'sound/machines/airlock.ogg'
-	var/doorClose = 'sound/machines/airlock.ogg'
+	var/doorOpen = 'sound/machines/airlock_open.ogg'
+	var/doorClose = 'sound/machines/airlock_close.ogg'
 	var/doorDeni = 'sound/machines/DeniedBeep.ogg'
 	var/id									// the room number, eg 101
 	var/obj/item/weapon/card/hotel_card/card// room's key card

code/modules/client/preference/loadout/loadout_shoes.dm

@@ -7,6 +7,14 @@
 	display_name = "sandals, wooden"
 	path = /obj/item/clothing/shoes/sandal
 
+/datum/gear/shoes/winterboots
+	display_name = "winter boots"
+	path = /obj/item/clothing/shoes/winterboots
+
+/datum/gear/shoes/workboots
+	display_name = "work boots"
+	path = /obj/item/clothing/shoes/workboots
+
 /datum/gear/shoes/fancysandals
 	display_name = "sandals, fancy"
 	cost = 5

code/modules/client/preference/preferences.dm

@@ -268,9 +268,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			dat += "</td><td width='405px' height='25px' valign='left'>"
 			dat += "<center>"
 			dat += "Slot <b>[slot_name]</b> - "
-			dat += "<a href=\"byond://?src=[user.UID()];preference=open_load_dialog\">Load slot</a> - "
-			dat += "<a href=\"byond://?src=[user.UID()];preference=save\">Save slot</a> - "
-			dat += "<a href=\"byond://?src=[user.UID()];preference=reload\">Reload slot</a>"
+			dat += "<a href=\"byond://?_src_=prefs;preference=open_load_dialog\">Load slot</a> - "
+			dat += "<a href=\"byond://?_src_=prefs;preference=save\">Save slot</a> - "
+			dat += "<a href=\"byond://?_src_=prefs;preference=reload\">Reload slot</a>"
 			dat += "</center>"
 			dat += "</td></tr></table>"
 			dat += "<table width='100%'><tr><td width='405px' height='200px' valign='top'>"
@@ -294,7 +294,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 				dat += "<b>Skin Tone:</b> <a href='?_src_=prefs;preference=s_tone;task=input'>[species == "Vox" ? "[s_tone]" : "[-s_tone + 35]/220"]</a><br>"
 			dat += "<b>Disabilities:</b> <a href='?_src_=prefs;preference=disabilities'>\[Set\]</a><br>"
 			dat += "<b>Nanotrasen Relation:</b> <a href ='?_src_=prefs;preference=nt_relation;task=input'>[nanotrasen_relation]</a><br>"
-			dat += "<a href='byond://?src=[user.UID()];preference=flavor_text;task=input'>Set Flavor Text</a><br>"
+			dat += "<a href='byond://?_src_=prefs;preference=flavor_text;task=input'>Set Flavor Text</a><br>"
 			if(lentext(flavor_text) <= 40)
 				if(!lentext(flavor_text))	dat += "\[...\]<br>"
 				else						dat += "[flavor_text]<br>"
@@ -358,7 +358,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			if(jobban_isbanned(user, "Records"))
 				dat += "<b>You are banned from using character records.</b><br>"
 			else
-				dat += "<a href=\"byond://?src=[user.UID()];preference=records;record=1\">Character Records</a><br>"
+				dat += "<a href=\"byond://?_src_=prefs;preference=records;record=1\">Character Records</a><br>"
 
 			dat += "<h2>Limbs</h2>"
 			if(species in list("Unathi")) //Species with alt heads.
@@ -658,7 +658,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			else
 				HTML += " <font color=red>\[No]</font></a>"
 			if(job.alt_titles)
-				HTML += "<br><b><a class='white' href=\"byond://?src=[user.UID()];preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></b></td></tr>"
+				HTML += "<br><b><a class='white' href=\"byond://?_src_=prefs;preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></b></td></tr>"
 			HTML += "</td></tr>"
 			continue
 /*
@@ -674,7 +674,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 		HTML += "<font color=[prefLevelColor]>[prefLevelLabel]</font></a>"
 
 		if(job.alt_titles)
-			HTML += "<br><b><a class='white' href=\"byond://?src=[user.UID()];preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></b></td></tr>"
+			HTML += "<br><b><a class='white' href=\"?_src_=prefs;preference=job;task=alt_title;job=\ref[job]\">\[[GetPlayerAltTitle(job)]\]</a></b></td></tr>"
 
 
 		HTML += "</td></tr>"
@@ -812,12 +812,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 
 /datum/preferences/proc/SetDisabilities(mob/user)
 	var/HTML = "<body>"
+	HTML += "<tt><center>"
 
-	// AUTOFIXED BY fix_string_idiocy.py
-	// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\client\preferences.dm:474: HTML += "<tt><center>"
-	HTML += {"<tt><center>
-		<b>Choose disabilities</b><ul>"}
-	// END AUTOFIX
 	HTML += ShowDisabilityState(user,DISABILITY_FLAG_NEARSIGHTED,"Needs Glasses")
 	HTML += ShowDisabilityState(user,DISABILITY_FLAG_FAT,"Obese")
 	HTML += ShowDisabilityState(user,DISABILITY_FLAG_EPILEPTIC,"Seizures")
@@ -827,50 +823,46 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	HTML += ShowDisabilityState(user,DISABILITY_FLAG_MUTE,"Mute")
 
 
-	// AUTOFIXED BY fix_string_idiocy.py
-	// C:\Users\Rob\Documents\Projects\vgstation13\code\modules\client\preferences.dm:481: HTML += "</ul>"
 	HTML += {"</ul>
 		<a href=\"?_src_=prefs;task=close;preference=disabilities\">\[Done\]</a>
 		<a href=\"?_src_=prefs;task=reset;preference=disabilities\">\[Reset\]</a>
 		</center></tt>"}
-	// END AUTOFIX
-	user << browse(null, "window=preferences")
-	user << browse(HTML, "window=disabil;size=350x300")
-	return
+
+	var/datum/browser/popup = new(user, "disabil", "<div align='center'>Choose Disabilities</div>", 350, 300)
+	popup.set_content(HTML)
+	popup.open(0)
 
 /datum/preferences/proc/SetRecords(mob/user)
 	var/HTML = "<body>"
 	HTML += "<tt><center>"
-	HTML += "<b>Set Character Records</b><br>"
 
-	HTML += "<a href=\"byond://?src=[user.UID()];preference=records;task=med_record\">Medical Records</a><br>"
+	HTML += "<a href=\"byond://?_src_=prefs;preference=records;task=med_record\">Medical Records</a><br>"
 
 	if(lentext(med_record) <= 40)
 		HTML += "[med_record]"
 	else
 		HTML += "[copytext(med_record, 1, 37)]..."
 
-	HTML += "<br><br><a href=\"byond://?src=[user.UID()];preference=records;task=gen_record\">Employment Records</a><br>"
+	HTML += "<br><a href=\"byond://?_src_=prefs;preference=records;task=gen_record\">Employment Records</a><br>"
 
 	if(lentext(gen_record) <= 40)
 		HTML += "[gen_record]"
 	else
 		HTML += "[copytext(gen_record, 1, 37)]..."
 
-	HTML += "<br><br><a href=\"byond://?src=[user.UID()];preference=records;task=sec_record\">Security Records</a><br>"
+	HTML += "<br><a href=\"byond://?_src_=prefs;preference=records;task=sec_record\">Security Records</a><br>"
 
 	if(lentext(sec_record) <= 40)
 		HTML += "[sec_record]<br>"
 	else
 		HTML += "[copytext(sec_record, 1, 37)]...<br>"
 
-	HTML += "<br>"
-	HTML += "<a href=\"byond://?src=[user.UID()];preference=records;records=-1\">\[Done\]</a>"
+	HTML += "<a href=\"byond://?_src_=prefs;preference=records;records=-1\">\[Done\]</a>"
 	HTML += "</center></tt>"
 
-	user << browse(null, "window=preferences")
-	user << browse(HTML, "window=records;size=350x300")
-	return
+	var/datum/browser/popup = new(user, "records", "<div align='center'>Character Records</div>", 350, 300)
+	popup.set_content(HTML)
+	popup.open(0)	
 
 /datum/preferences/proc/GetPlayerAltTitle(datum/job/job)
 	return player_alt_titles.Find(job.title) > 0 \
@@ -2236,7 +2228,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 		dat += "<a href='?_src_=prefs;preference=changeslot;num=[i];'>[name]</a><br>"
 
 	dat += "<hr>"
-	dat += "<a href='byond://?src=[user.UID()];preference=close_load_dialog'>Close</a><br>"
+	dat += "<a href='byond://?_src_=prefs;preference=close_load_dialog'>Close</a><br>"
 	dat += "</center></tt>"
 //		user << browse(dat, "window=saves;size=300x390")
 	var/datum/browser/popup = new(user, "saves", "<div align='center'>Character Saves</div>", 300, 390)

code/modules/clothing/clothing.dm

@@ -201,7 +201,7 @@ BLIND     // can't see anything
 /obj/item/clothing/gloves/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/wirecutters))
 		if(!clipped)
-			playsound(src.loc, W>usesound, 100, 1)
+			playsound(src.loc, W.usesound, 100, 1)
 			user.visible_message("<span class='warning'>[user] snips the fingertips off [src].</span>","<span class='warning'>You snip the fingertips off [src].</span>")
 			clipped = 1
 			name = "mangled [name]"

code/modules/clothing/head/helmet.dm

@@ -223,7 +223,7 @@ obj/item/clothing/head/blob
 	desc = "Deus Vult."
 	icon_state = "knight_templar"
 	item_state = "knight_templar"
-
+	armor = list(melee = 20, bullet = 7, laser = 2, energy = 2, bomb = 2, bio = 2, rad = 0)
 
 //Commander
 /obj/item/clothing/head/helmet/ert/command

code/modules/clothing/head/soft_caps.dm

@@ -6,6 +6,10 @@
 	item_color = "cargo"
 	var/flipped = 0
 	actions_types = list(/datum/action/item_action/flip_cap)
+	species_fit = list("Vox")
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/head.dmi'
+		)
 
 /obj/item/clothing/head/soft/dropped()
 	icon_state = "[item_color]soft"

code/modules/clothing/shoes/miscellaneous.dm

@@ -103,6 +103,16 @@
 	can_cut_open = 1
 	icon_state = "workboots"
 
+/obj/item/clothing/shoes/winterboots
+	name = "winter boots"
+	desc = "Boots lined with 'synthetic' animal fur."
+	can_cut_open = 1
+	icon_state = "winterboots"
+	cold_protection = FEET|LEGS
+	min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
+	heat_protection = FEET|LEGS
+	max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
+
 /obj/item/clothing/shoes/cult
 	name = "boots"
 	desc = "A pair of boots worn by the followers of Nar-Sie."

code/modules/clothing/spacesuits/breaches.dm

@@ -175,7 +175,7 @@ var/global/list/breach_burn_descriptors = list(
 //Handles repairs (and also upgrades).
 
 /obj/item/clothing/suit/space/attackby(obj/item/W as obj, mob/user as mob, params)
-	if(istype(W,/obj/item/stack/sheet/mineral/plastic) || istype(W,/obj/item/stack/sheet/metal))
+	if(istype(W,/obj/item/stack/sheet/plastic) || istype(W,/obj/item/stack/sheet/metal))
 
 		if(istype(src.loc,/mob/living))
 			to_chat(user, "\red How do you intend to patch a hardsuit while someone is wearing it?")
@@ -188,10 +188,10 @@ var/global/list/breach_burn_descriptors = list(
 		var/obj/item/stack/sheet/P = W
 		if(P.amount < 3)
 			P.use(P.amount)
-			repair_breaches(BURN, ( istype(P,/obj/item/stack/sheet/mineral/plastic) ? P.amount : (P.amount*2) ), user)
+			repair_breaches(BURN, ( istype(P,/obj/item/stack/sheet/plastic) ? P.amount : (P.amount*2) ), user)
 		else
 			P.use(3)
-			repair_breaches(BURN, ( istype(P,/obj/item/stack/sheet/mineral/plastic) ? 3 : 5), user)
+			repair_breaches(BURN, ( istype(P,/obj/item/stack/sheet/plastic) ? 3 : 5), user)
 		return
 
 	else if(istype(W, /obj/item/weapon/weldingtool))

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -136,6 +136,7 @@
 	desc = "A paramedic EVA helmet. Used in the recovery of bodies from space."
 	icon_state = "paramedic-eva-helmet"
 	item_state = "paramedic-eva-helmet"
+	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/helmet.dmi'
 		)
@@ -148,6 +149,7 @@
 	icon_state = "paramedic-eva"
 	item_state = "paramedic-eva"
 	desc = "A paramedic EVA suit. Used in the recovery of bodies from space."
+	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/suit.dmi'
 		)
@@ -162,13 +164,18 @@
 	desc = "A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies."
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
 	species_restricted = list("exclude", "Diona", "Wryn")
-	species_fit = list("Vox", "Vulpkanin")
+	species_fit = list("Tajaran", "Unathi", "Vox", "Vulpkanin")
 	sprite_sheets = list(
+		"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
+		"Unathi" = 'icons/mob/species/unathi/suit.dmi',
 		"Vox" = 'icons/mob/species/vox/suit.dmi',
-		"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi'
+		"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
 		)
 	sprite_sheets_obj = list(
-		"Vox" = 'icons/obj/clothing/species/vox/suits.dmi'
+		"Tajaran" = 'icons/obj/clothing/species/tajaran/suits.dmi',
+		"Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi',
+		"Vox" = 'icons/obj/clothing/species/vox/suits.dmi',
+		"Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/suits.dmi'
 		)
 
 /obj/item/clothing/head/helmet/space/eva
@@ -180,13 +187,16 @@
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
 	flash_protect = 0
 	species_restricted = list("exclude", "Diona", "Wryn")
-	species_fit = list("Vox", "Vulpkanin")
+	species_fit = list("Tajaran", "Unathi", "Vox", "Vulpkanin")
 	sprite_sheets = list(
+		"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
+		"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
 		"Vox" = 'icons/mob/species/vox/helmet.dmi',
 		"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
 		)
 	sprite_sheets_obj = list(
-		"Vox" = 'icons/obj/clothing/species/vox/hats.dmi'
+		"Vox" = 'icons/obj/clothing/species/vox/hats.dmi',
+		"Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/hats.dmi'
 		)
 
 //Mime's Hardsuit

code/modules/clothing/suits/armor.dm

@@ -209,6 +209,7 @@
 	icon_state = "knight_templar"
 	item_state = "knight_templar"
 	allowed = list(/obj/item/weapon/nullrod/claymore)
+	armor = list(melee = 25, bullet = 5, laser = 5, energy = 5, bomb = 0, bio = 0, rad = 0)
 
 /obj/item/clothing/suit/armor/bulletproof
 	name = "Bulletproof Vest"

code/modules/crafting/craft.dm

@@ -2,6 +2,8 @@
 	var/busy
 	var/viewing_category = 1 //typical powergamer starting on the Weapons tab
 	var/list/categories = list(CAT_WEAPON,CAT_AMMO,CAT_ROBOT,CAT_FOOD,CAT_MISC,CAT_PRIMAL)
+	var/display_craftable_only = FALSE
+	var/display_compact = TRUE
 
 
 
@@ -34,8 +36,8 @@
 						else
 							continue
 			return 0
-	for(var/A in R.chem_catalists)
-		if(contents[A] < R.chem_catalists[A])
+	for(var/A in R.chem_catalysts)
+		if(contents[A] < R.chem_catalysts[A])
 			return 0
 	return 1
 
@@ -225,68 +227,70 @@
 		Deletion.Cut(Deletion.len)
 		qdel(DL)
 
-/datum/personal_crafting/proc/craft(mob/user)
-	if(user.incapacitated() || user.lying || istype(user.loc, /obj/mecha))
-		return
+/datum/personal_crafting/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, datum/topic_state/state = not_incapacitated_turf_state)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "personal_crafting.tmpl", "Crafting Menu", 700, 800, state = state)
+		ui.open()
+
+/datum/personal_crafting/ui_data(mob/user)
+	var/list/data = list()
+	var/cur_category = categories[viewing_category]
+	data["busy"] = busy
+	data["prev_cat"] = categories[prev_cat()]
+	data["category"] = cur_category
+	data["next_cat"] = categories[next_cat()]
+	data["display_craftable_only"] = display_craftable_only
+	data["display_compact"] = display_compact
+
 	var/list/surroundings = get_surroundings(user)
-	var/dat = "<h3>Crafting menu</h3>"
-	if(busy)
-		dat += "<div class='statusDisplay'>Crafting in progress...</div>"
-	else
-		dat += "<A href='?src=[UID()];backwardCat=1'><--</A>"
-		dat += " [categories[prev_cat()]] |"
-		dat += " <B>[categories[viewing_category]]</B> "
-		dat += "| [categories[next_cat()]] "
-		dat += "<A href='?src=[UID()];forwardCat=1'>--></A><BR><BR>"
-
-		dat += "<div class='statusDisplay'>"
-
-		//Filter the recipes we can craft to the top
-		var/list/can_craft = list()
-		var/list/cant_craft = list()
-		for(var/datum/crafting_recipe/R in crafting_recipes)
-			if(R.category != categories[viewing_category])
-				continue
-			if(check_contents(R, surroundings))
-				can_craft += R
-			else
-				cant_craft += R
-
-		for(var/datum/crafting_recipe/R in can_craft)
-			dat += build_recipe_text(R, surroundings)
-		for(var/datum/crafting_recipe/R in cant_craft)
-			dat += build_recipe_text(R, surroundings)
-
-
-		dat += "</div>"
-
-	var/datum/browser/popup = new(user, "crafting", "Crafting", 500, 500)
-	popup.set_content(dat)
-	popup.open()
-	return
+	var/list/can_craft = list()
+	var/list/cant_craft = list()
+	for(var/rec in crafting_recipes)
+		var/datum/crafting_recipe/R = rec
+		if(R.category != cur_category)
+			continue
+		if(check_contents(R, surroundings))
+			can_craft += list(build_recipe_data(R))
+		else
+			cant_craft += list(build_recipe_data(R))
+	data["can_craft"] = can_craft
+	data["cant_craft"] = cant_craft
+	return data
 
 /datum/personal_crafting/Topic(href, href_list)
-	if(usr.stat || usr.lying)
+	if(..())
 		return
+
 	if(href_list["make"])
 		var/datum/crafting_recipe/TR = locate(href_list["make"])
 		busy = 1
-		craft(usr)
+		nanomanager.update_uis(src)
 		var/fail_msg = construct_item(usr, TR)
 		if(!fail_msg)
-			usr << "<span class='notice'>[TR.name] constructed.</span>"
+			to_chat(usr, "<span class='notice'>[TR.name] constructed.</span>")
 		else
-			usr << "<span class ='warning'>Construction failed[fail_msg]</span>"
+			to_chat(usr, "<span class ='warning'>Construction failed[fail_msg]</span>")
 		busy = 0
-		craft(usr)
+		nanomanager.update_uis(src)
 	if(href_list["forwardCat"])
 		viewing_category = next_cat()
-		usr << "<span class='notice'>Category is now [categories[viewing_category]].</span>"
-		craft(usr)
+		to_chat(usr, "<span class='notice'>Category is now [categories[viewing_category]].</span>")
+		. = TRUE
 	if(href_list["backwardCat"])
 		viewing_category = prev_cat()
-		usr << "<span class='notice'>Category is now [categories[viewing_category]].</span>"
-		craft(usr)
+		to_chat(usr, "<span class='notice'>Category is now [categories[viewing_category]].</span>")
+		. = TRUE
+	if(href_list["toggle_recipes"])
+		display_craftable_only = !display_craftable_only
+		to_chat(usr, "<span class='notice'>You will now [display_craftable_only ? "only see recipes you can craft":"see all recipes"].</span>")
+		. = TRUE
+	if(href_list["toggle_compact"])
+		display_compact = !display_compact
+		to_chat(usr, "<span class='notice'>Crafting menu is now [display_compact? "compact" : "full size"].</span>")
+		. = TRUE
+
+	nanomanager.update_uis(src)
 
 //Next works nicely with modular arithmetic
 /datum/personal_crafting/proc/next_cat()
@@ -301,39 +305,32 @@
 	if(. <= 0)
 		. = categories.len
 
-/datum/personal_crafting/proc/build_recipe_text(datum/crafting_recipe/R, list/contents)
-	. = ""
-	var/name_text = ""
+/datum/personal_crafting/proc/build_recipe_data(datum/crafting_recipe/R)
+	var/list/data = list()
+	data["name"] = R.name
+	data["ref"] = "\ref[R]"
 	var/req_text = ""
 	var/tool_text = ""
-	var/catalist_text = ""
-	if(check_contents(R, contents))
-		name_text ="<A href='?src=[UID()];make=\ref[R]'>[R.name]</A>"
+	var/catalyst_text = ""
 
-	else
-		name_text = "<span class='linkOff'>[R.name]</span>"
+	for(var/a in R.reqs)
+		//We just need the name, so cheat-typecast to /atom for speed (even tho Reagents are /datum they DO have a "name" var)
+		//Also these are typepaths so sadly we can't just do "[a]"
+		var/atom/A = a
+		req_text += " [R.reqs[A]] [initial(A.name)],"
+	req_text = replacetext(req_text, ",", "", -1)
+	data["req_text"] = req_text
 
-	if(name_text)
-		for(var/A in R.reqs)
-			if(ispath(A, /obj))
-				var/obj/O = A
-				req_text += " [R.reqs[A]] [initial(O.name)]"
-			else if(ispath(A, /datum/reagent))
-				var/datum/reagent/RE = A
-				req_text += " [R.reqs[A]] [initial(RE.name)]"
+	for(var/a in R.chem_catalysts)
+		var/atom/A = a //cheat-typecast
+		catalyst_text += " [R.chem_catalysts[A]] [initial(A.name)],"
+	catalyst_text = replacetext(catalyst_text, ",", "", -1)
+	data["catalyst_text"] = catalyst_text
 
-		if(R.chem_catalists.len)
-			catalist_text += ", Catalysts:"
-			for(var/C in R.chem_catalists)
-				if(ispath(C, /datum/reagent))
-					var/datum/reagent/RE = C
-					catalist_text += " [R.chem_catalists[C]] [initial(RE.name)]"
+	for(var/a in R.tools)
+		var/atom/A = a //cheat-typecast
+		tool_text += " [R.tools[A]] [initial(A.name)],"
+	tool_text = replacetext(tool_text, ",", "", -1)
+	data["tool_text"] = tool_text
 
-		if(R.tools.len)
-			tool_text += ", Tools:"
-			for(var/O in R.tools)
-				if(ispath(O, /obj))
-					var/obj/T = O
-					tool_text += " [R.tools[O]] [initial(T.name)]"
-
-		. = "[name_text][req_text][tool_text][catalist_text]<BR>"
+	return data

code/modules/crafting/recipes.dm

@@ -5,7 +5,7 @@
 	var/tools[] = list() //type paths of items needed but not consumed
 	var/time = 30 //time in deciseconds
 	var/parts[] = list() //type paths of items that will be placed in the result
-	var/chem_catalists[] = list() //like tools but for reagents
+	var/chem_catalysts[] = list() //like tools but for reagents
 	var/category = CAT_MISC // Recipe category
 
 /datum/crafting_recipe/proc/AdjustChems(var/obj/resultobj as obj)
@@ -286,7 +286,7 @@
 	time = 150
 	reqs = list(/obj/item/stack/rods = 3,
 				/obj/item/stack/cable_coil = 10,
-				/obj/item/stack/sheet/mineral/plastic = 3,
+				/obj/item/stack/sheet/plastic = 3,
 				/obj/item/stack/sheet/wood = 5)
 	tools = list(/obj/item/weapon/weldingtool,
 				/obj/item/weapon/screwdriver)

code/modules/customitems/item_defines.dm

@@ -697,3 +697,32 @@
 	name = "Voxcaster"
 	desc = "Battered, Sol-made military radio backpack that had its speakers fried from playing Vox opera. The words 'Swift-Talon' are crudely scratched onto its side."
 	icon_state = "voxcaster_fluff"
+
+/obj/item/clothing/head/wizard/fake/fluff/dreamy //phantasmicdream : Dreamy Rockwall
+	name = "strange witch hat"
+	desc = "A shapeshifting witch hat. A strange aura comes from it..."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "classic_witch"
+	item_state = "classic_witch"
+
+/obj/item/clothing/head/wizard/fake/fluff/dreamy/attack_self(mob/user)
+	var/list/options = list()
+	options["Classic"] = "classic_witch"
+	options["Good"] = "good_witch"
+	options["Dark"] = "dark_witch"
+	options["Steampunk"] ="steampunk_witch"
+	options["Healer"] = "healer_witch"
+	options["Cute"] = "cutie_witch"
+	options["Shy"] = "shy_witch"
+	options["Sexy"] ="sexy_witch"
+	options["Bunny"] = "bunny_witch"
+	options["Potions"] = "potions_witch"
+	options["Syndicate"] = "syndie_witch"
+	options["Nanotrasen"] ="nt_witch"
+
+	var/choice = input(user, "To what form do you wish to Shapeshift this hat?", "Shapeshift Hat") as null|anything in options
+
+	if(choice && !user.stat && in_range(user, src))
+		icon_state = options[choice]
+		to_chat(user, "Your strange witch hat has now shapeshifted into it's [choice] form!")
+		return 1

code/modules/events/spacevine.dm

@@ -392,7 +392,7 @@
 	name = "plasticine"
 	hue = "#222288"
 	mineral_results = list(
-	/obj/item/stack/sheet/mineral/plastic = 1
+	/obj/item/stack/sheet/plastic = 1
 	)
 
 /datum/spacevine_mutation/mineral/wood

code/modules/fish/fish_eggs.dm

@@ -5,81 +5,65 @@
 	icon = 'icons/obj/fish_items.dmi'
 	icon_state = "eggs"
 	w_class = 2
-	var/fish_type = null			//Holds the name of the fish that the egg is for
-
-/obj/item/fish_eggs/New()
-	..()
-
-var/global/list/fish_eggs_list = list("dud" = /obj/item/fish_eggs,
-									"goldfish" = /obj/item/fish_eggs/goldfish,
-									"clownfish" = /obj/item/fish_eggs/clownfish,
-									"shark" = /obj/item/fish_eggs/shark,
-									"baby space carp" = /obj/item/fish_eggs/babycarp,
-									"catfish" = /obj/item/fish_eggs/catfish,
-									"feederfish" = /obj/item/fish_eggs/feederfish,
-									"salmon" = /obj/item/fish_eggs/salmon,
-									"shrimp" = /obj/item/fish_eggs/shrimp,
-									"electric eel" = /obj/item/fish_eggs/electric_eel,
-									"glofish" = /obj/item/fish_eggs/glofish,
-									)
+	var/datum/fish/fish_type = null			//Holds the datum of the fish that the egg is for, null means dud eggs
 
 /obj/item/fish_eggs/goldfish
 	name = "goldfish eggs"
 	desc = "Goldfish eggs, surprisingly, don't contain actual gold."
 	icon_state = "gold_eggs"
-	fish_type = "goldfish"
+	fish_type = /datum/fish/goldfish
 
 /obj/item/fish_eggs/clownfish
 	name = "clownfish eggs"
 	desc = "Even as eggs, they are funnier than the clown. HONK!"
 	icon_state = "clown_eggs"
-	fish_type = "clownfish"
+	fish_type = /datum/fish/clownfish
 
 /obj/item/fish_eggs/shark
 	name = "shark eggs"
 	desc = "We're gonna need a- Oh wait, they're still eggs."
 	icon_state = "shark_eggs"
-	fish_type = "shark"
+	fish_type = /datum/fish/shark
 
 /obj/item/fish_eggs/babycarp
 	name = "baby space carp eggs"
 	desc = "Eggs from the substantially smaller form of the intergalactic terror."
 	icon_state = "babycarp_eggs"
-	fish_type = "baby space carp"
+	fish_type = /datum/fish/babycarp
 
 /obj/item/fish_eggs/catfish
 	name = "catfish eggs"
 	desc = "A bottom-feeding species noted for their similarity to cats and Tajaran."
 	icon_state = "catfish_eggs"
-	fish_type = "catfish"
+	fish_type = /datum/fish/catfish
 
 /obj/item/fish_eggs/feederfish
 	name = "feeder fish eggs"
 	desc = "These generic fish are commonly found being eaten by larger fish."
 	icon_state = "feederfish_eggs"
-	fish_type = "feederfish"
+	fish_type = /datum/fish/feederfish
 
 /obj/item/fish_eggs/salmon
 	name = "salmon eggs"
 	desc = "A collection of salmon eggs."
 	icon_state = "salmon_eggs"
-	fish_type = "salmon"
+	fish_type = /datum/fish/salmon
 
 /obj/item/fish_eggs/shrimp
 	name = "shrimp eggs"
 	desc = "Eggs for shrimp. You figured they'd be smaller though..."
 	icon_state = "shrimp_eggs"
-	fish_type = "shrimp"
+	fish_type = /datum/fish/shrimp
 
 /obj/item/fish_eggs/electric_eel
 	name = "electric eel eggs"
 	desc = "A pile of eggs for a slimy, shocking, sea-serpent."
 	icon_state = "electric_eel_eggs"
-	fish_type = "electric eel"
+	fish_type = /datum/fish/electric_eel
 
 /obj/item/fish_eggs/glofish
 	name = "glofish eggs"
 	desc = "A cluster of bright neon eggs belonging to a bio-luminescent species of fish."
 	icon_state = "glofish_eggs"
-	fish_type = "glofish"
+	fish_type = /datum/fish/glofish
 

code/modules/fish/fish_items.dm

@@ -1,17 +1,4 @@
 
-var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfish,
-									"clownfish" = /obj/item/weapon/grown/bananapeel/clownfish,
-									"shark" = /obj/item/weapon/fish/shark,
-									"baby space carp" = /obj/item/weapon/fish/babycarp,
-									"catfish" = /obj/item/weapon/fish/catfish,
-									"feederfish" = /obj/item/weapon/reagent_containers/food/snacks/feederfish,
-									"salmon" = /obj/item/weapon/fish/salmon,
-									"shrimp" = /obj/item/weapon/reagent_containers/food/snacks/shrimp,
-									"electric eel" = /obj/item/weapon/fish/electric_eel,
-									"glofish" = /obj/item/weapon/fish/glofish
-,
-									)
-
 //////////////////////////////////////////////
 //			Aquarium Supplies				//
 //////////////////////////////////////////////

code/modules/fish/fish_types.dm

@@ -0,0 +1,76 @@
+
+/datum/fish
+	var/fish_name = "generic fish"
+	var/egg_item = /obj/item/fish_eggs
+	var/fish_item = /obj/item/weapon/fish
+	var/crossbreeder = 1	//determines if the fish will attempt to breed with other types, set to 0 if you want the fish to only lay eggs with its own species
+
+/datum/fish/proc/special_interact(obj/machinery/fishtank/my_tank)
+	return
+
+/datum/fish/goldfish
+	fish_name = "goldfish"
+	egg_item = /obj/item/fish_eggs/goldfish
+	fish_item = /obj/item/weapon/fish/goldfish
+
+/datum/fish/glofish
+	fish_name = "glofish"
+	egg_item = /obj/item/fish_eggs/glofish
+	fish_item = /obj/item/weapon/fish/glofish
+
+/datum/fish/clownfish
+	fish_name = "clownfish"
+	egg_item = /obj/item/fish_eggs/clownfish
+	fish_item = /obj/item/weapon/grown/bananapeel/clownfish
+
+/datum/fish/shark
+	fish_name = "shark"
+	egg_item = /obj/item/fish_eggs/shark
+	fish_item = /obj/item/weapon/fish/shark
+
+/datum/fish/babycarp
+	fish_name = "baby space carp"
+	egg_item = /obj/item/fish_eggs/babycarp
+	fish_item = /obj/item/weapon/fish/babycarp
+
+/datum/fish/catfish
+	fish_name = "catfish"
+	egg_item = /obj/item/fish_eggs/catfish
+	fish_item = /obj/item/weapon/fish/catfish
+
+/datum/fish/catfish/special_interact(obj/machinery/fishtank/my_tank)
+	if(!my_tank || !istype(my_tank))
+		return
+	if(my_tank.filth_level > 0 && prob(33))
+		my_tank.adjust_filth_level(-0.1)
+
+/datum/fish/salmon
+	fish_name = "salmon"
+	egg_item = /obj/item/fish_eggs/salmon
+	fish_item = /obj/item/weapon/fish/salmon
+
+/datum/fish/shrimp
+	fish_name = "shrimp"
+	egg_item = /obj/item/fish_eggs/shrimp
+	fish_item = /obj/item/weapon/reagent_containers/food/snacks/shrimp
+	crossbreeder = 0
+
+/datum/fish/feederfish
+	fish_name = "feeder fish"
+	egg_item = /obj/item/fish_eggs/feederfish
+	fish_item = /obj/item/weapon/reagent_containers/food/snacks/feederfish
+
+/datum/fish/feederfish/special_interact(obj/machinery/fishtank/my_tank)
+	if(!my_tank || !istype(my_tank))
+		return
+	if(my_tank.fish_count < 2)
+		return
+	if(my_tank.food_level <= 5 && prob(25))
+		my_tank.adjust_food_level(1)
+		my_tank.kill_fish(src)
+
+/datum/fish/electric_eel
+	fish_name = "electric eel"
+	egg_item = /obj/item/fish_eggs/electric_eel
+	fish_item = /obj/item/weapon/fish/electric_eel
+	crossbreeder = 0

code/modules/fish/fishtank.dm

@@ -112,7 +112,7 @@
 	if(light_switch)
 		set_light(2,2,"#a0a080")
 	else
-		set_light(0)
+		adjust_tank_light()
 
 //////////////////////////////
 //		NEW() PROCS			//
@@ -176,6 +176,7 @@
 /obj/machinery/fishtank/process()
 	//Start by counting fish in the tank
 	fish_count = 0
+	var/ate_food = 0
 	for(var/fish in fish_list)
 		if(fish)
 			fish_count++
@@ -184,43 +185,38 @@
 	if((fish_count * 50) > water_level)
 		if(prob(50))								//Not enough water for all the fish, chance to kill one
 			kill_fish()								//Chance passed, kill a random fish
-			filth_level += 2						//Dead fish raise the filth level quite a bit, reflect this
+			adjust_filth_level(2)					//Dead fish raise the filth level quite a bit, reflect this
 
 	//Check filth_level
-	check_filth_level()
 	if(filth_level == 10 && fish_count > 0)			//This tank is nasty and possibly unsuitable for fish if any are in it
 		if(prob(30))								//Chance for a fish to die each cycle while the tank is this nasty
 			kill_fish()								//Kill a random fish, don't raise filth level since we're at cap already
 
 	//Check breeding conditions
 	if(fish_count >=2 && egg_count < max_fish)		//Need at least 2 fish to breed, but won't breed if there are as many eggs as max_fish
-		if(food_level > 2 && filth_level <=5)		//Breeding is going to use extra food, and the filth_level shouldn't be too high
+		if(food_level >= 0.2 && filth_level <=5)	//Breeding is going to use extra food, and the filth_level shouldn't be too high
 			if(prob(((fish_count - 2) * 5)+10))		//Chances increase with each additional fish, 10% base + 5% per additional fish
-				egg_count++						//A new set of eggs were laid, increase egg_count
-				egg_list.Add(select_egg_type())		//Add the new egg to the egg_list for storage
-				food_level -= 2						//Remove extra food for the breeding process
+				breed_fish()
+				adjust_food_level(-0.2)				//Remove extra food for the breeding process
+				ate_food = 1
 
 	//Handle standard food and filth adjustments
-	check_food_level()
-	var/ate_food = 0
 	if(food_level > 0 && prob(50))					//Chance for the fish to eat some food
 		if(food_level >= (fish_count * 0.1))		//If there is at least enough food to go around, feed all the fish
-			food_level -= fish_count * 0.1
+			adjust_food_level(fish_count * -0.1)
 		else										//Use up the last of the food
-			food_level = 0
+			adjust_food_level(-food_level)
 		ate_food = 1
-	check_food_level()
 
 	if(water_level > 0)								//Don't dirty the tank if it has no water
 		if(fish_count == 0)							//If the tank has no fish, algae growth can occur
 			if(filth_level < 7.5 && prob(15))		//Algae growth is a low chance and cannot exceed filth_level of 7.5
-				filth_level += 0.05					//Algae growth is slower than fish filth build-up
+				adjust_filth_level(0.05)			//Algae growth is slower than fish filth build-up
 		else if(filth_level < 10 && prob(10))		//Chance for the tank to get dirtier if the filth_level isn't 10
 			if(ate_food && prob(25))				//If they ate this cycle, there is an additional chance they make a bigger mess
-				filth_level += fish_count * 0.1
+				adjust_filth_level(fish_count * 0.1)
 			else									//If they didn't make the big mess, make a little one
-				filth_level += 0.1
-	check_filth_level()
+				adjust_filth_level(0.1)
 
 	//Handle special interactions
 	handle_special_interactions()
@@ -228,54 +224,42 @@
 	//Handle water leakage from damage
 	if(water_level > 0)								//Can't leak water if there is no water in the tank
 		if(leaking == 2)							//At or below 25% health, the tank will lose 10 water_level per cycle (major leak)
-			water_level -= 10
+			adjust_water_level(-10)
 		else if(leaking == 1)						//At or below 50% health, the tank will lose 1 water_level per cycle (minor leak)
-			water_level -= 1
-	check_water_level()
+			adjust_water_level(-1)
+	update_icon()
 
 //////////////////////////////
 //		SUPPORT PROCS		//
 //////////////////////////////
 
 /obj/machinery/fishtank/proc/handle_special_interactions()
-	var/glo_light = 0
-	for(var/fish in fish_list)
-		switch(fish)
-			if("catfish")							//Catfish have a small chance of cleaning some filth since they are a bottom-feeder
-				if((filth_level > 0) && prob(30))
-					filth_level -= 0.1
-			if("feederfish")						//Feeder fish have a small chance of sacrificing themselves to produce some food
-				if(fish_count < 2)					//Don't sacrifice the last fish, there's nothing to eat it
-					continue
-				if(food_level <= 5 && prob(25))
-					kill_fish("feederfish")			//Kill the fish to reflect it's sacrifice, but don't increase the filth_level
-					food_level += 1					//The corpse became food for the other fish, ecology at it's finest
-			if("glofish")
-				glo_light++
-	if(!light_switch && (glo_light > 0))
-		set_light(2,glo_light,"#99FF66")
-	check_food_level()
-	check_filth_level()
-	check_water_level()
+	for(var/datum/fish/fish in fish_list)
+		fish.special_interact(src)
+	adjust_tank_light()
 
-/obj/machinery/fishtank/proc/check_water_level()
-	if(water_level < 0)								//Water_level cannot be negative, set it to 0 if it is
-		water_level = 0
-	if(water_level > water_capacity)				//Water_level cannot exceed capacity, set it to capacity if it does
-		water_level = water_capacity
+/obj/machinery/fishtank/proc/adjust_tank_light()
+	if(light_switch)								//tank light overrides fish lights
+		return
+	else
+		var/glo_light = 0
+		for(var/datum/fish/fish in fish_list)
+			if(istype(fish, /datum/fish/glofish))
+				glo_light ++
+		if(glo_light)
+			set_light(2, glo_light, "#99FF66")
+		else
+			set_light(0, 0)
+
+/obj/machinery/fishtank/proc/adjust_water_level(amount = 0)
+	water_level = min(water_capacity, max(0, water_level + amount))
 	update_icon()
 
-/obj/machinery/fishtank/proc/check_filth_level()
-	if(filth_level < 0)								//Filth_level cannot be negative, set it to 0 if it is
-		filth_level = 0
-	if(filth_level > 10)							//Filth_level cannot exceed 10 (cap), set it to 10 if it does
-		filth_level = 10
+/obj/machinery/fishtank/proc/adjust_filth_level(amount = 0)
+	filth_level = min(10, max(0, filth_level + amount))
 
-/obj/machinery/fishtank/proc/check_food_level()
-	if(food_level < 0)								//Food_level cannot be negative, set it to 0 if it is
-		food_level = 0
-	if(food_level > 10)								//Food_level cannot exceed 10 (cap), set it to 10 if it does
-		food_level = 10
+/obj/machinery/fishtank/proc/adjust_food_level(amount = 0)
+	food_level = min(10, max(0, food_level + amount))
 
 /obj/machinery/fishtank/proc/check_health()
 	//Max value check
@@ -292,37 +276,28 @@
 	if(cur_health <= 0)								//The tank is broken, destroy it
 		destroy()
 
-/obj/machinery/fishtank/proc/kill_fish(var/type = null)
+/obj/machinery/fishtank/proc/kill_fish(datum/fish/fish_type = null)
 	//Check if we were passed a fish to kill, otherwise kill a random one
-	if(type)
-		fish_list.Remove(type)						//Kill a fish of the specified type
-		fish_count --								//Lower fish_count to reflect the death of a fish, so the everything else works fine
-	else
-		fish_list.Remove(pick(fish_list))			//Kill a random fish
-		fish_count --								//Lower fish_count to reflect the death of a fish, so the everything else works fine
+	if(!fish_type)
+		fish_type = pick(fish_list)
+	fish_list.Remove(fish_type)						//Kill a fish of the specified type
+	fish_count --									//Lower fish_count to reflect the death of a fish, so the everything else works fine
+	if(istype(fish_type, /datum/fish/glofish))
+		adjust_tank_light()
+	qdel(fish_type)
 
-/obj/machinery/fishtank/proc/add_fish(var/type = null)
+/obj/machinery/fishtank/proc/add_fish(datum/fish/fish_type = null)
 	//Check if we were passed a fish type
-	if(type)
-		fish_list.Add("[type]")						//Add a fish of the specified type
+	if(fish_type)
+		fish_type = new fish_type
+		fish_list.Add(fish_type)					//Add a fish of the specified type
 		fish_count++								//Increase fish_count to reflect the introduction of a fish, so the everything else works fine
 		//Announce the new fish
-		src.visible_message("A new [type] has hatched in \the [src]!")
+		visible_message("A new [fish_type.fish_name] has hatched in \the [src]!")
 	//Null type fish are dud eggs, give a message to inform the player
 	else
 		to_chat(usr, "The eggs disolve in the water. They were duds!")
 
-/obj/machinery/fishtank/proc/select_egg_type()
-	var/fish = pick(fish_list)						//Select a fish from the fish in the tank
-	if(prob(25))									//25% chance to be a dud (blank) egg
-		fish = "dud"
-	var/obj/item/fish_eggs/egg_path	= null			//Create empty variable to receive the egg_path
-	egg_path = fish_eggs_list[fish]					//Locate the corresponding path from fish_eggs_list that matches the fish
-	if(!egg_path)									//The fish wasn't located in the fish_eggs_list, potentially due to a typo, so return a dud egg
-		return /obj/item/fish_eggs
-	else											//The fish was located in the fish_eggs_list, so return the proper egg
-		return egg_path
-
 /obj/machinery/fishtank/proc/harvest_eggs(var/mob/user)
 	if(!egg_count)									//Can't harvest non-existant eggs
 		return
@@ -342,17 +317,17 @@
 	if(!fish_count)									//Can't catch non-existant fish!
 		to_chat(usr, "There are no fish in \the [src] to catch!")
 		return
-
-	var/caught_fish
-	caught_fish = input("Select a fish to catch.", "Fishing", caught_fish) in fish_list		//Select a fish from the tank
+	var/list/fish_names_list = list()
+	for(var/datum/fish/fish_type in fish_list)
+		fish_names_list += list("[fish_type.fish_name]" = fish_type)
+	var/caught_fish = input("Select a fish to catch.", "Fishing") as null|anything in fish_names_list		//Select a fish from the tank
 	if(caught_fish)
-		var/dead_fish = null
-		dead_fish = fish_items_list[caught_fish]	//Locate the appropriate fish_item for the caught fish
-		if(!dead_fish)								//No fish_item found, possibly due to typo or not being listed. Do nothing.
-			return
-		kill_fish(caught_fish)						//Kill the caught fish from the tank
 		user.visible_message("[user.name] harvests \a [caught_fish] from \the [src].", "You scoop \a [caught_fish] out of \the [src].")
-		new dead_fish(get_turf(user))				//Spawn the appropriate fish_item at the user's feet.
+		var/datum/fish/fish_type = fish_names_list[caught_fish]
+		var/fish_item = fish_type.fish_item
+		if(fish_item)
+			new fish_item(get_turf(user))			//Spawn the appropriate fish_item at the user's feet.
+		kill_fish(fish_type)						//Kill the caught fish from the tank
 
 /obj/machinery/fishtank/proc/destroy(var/deconstruct = 0)
 	var/turf/T = get_turf(src)										//Store the tank's turf for atmos updating after deletion of tank
@@ -392,6 +367,34 @@
 				var/turf/simulated/S = T
 				S.MakeSlippery()
 
+/obj/machinery/fishtank/proc/breed_fish()
+	var/list/breed_candidates = fish_list.Copy()
+	var/datum/fish/parent1 = pick_n_take(breed_candidates)
+	var/datum/fish/parent2 = null
+	if(!parent1.crossbreeder)							//fish with crossbreed = 0 will only breed with their own species, and only leave duds if they can't breed
+		if(parent1 in breed_candidates)
+			egg_list.Add(parent1.egg_item)
+		else
+			egg_list.Add(/obj/item/fish_eggs)
+	else
+		parent2 = pick(breed_candidates)
+		if(!parent2.crossbreeder)						//second fish refuses to crossbreed, spawn a dud
+			egg_list.Add(/obj/item/fish_eggs)
+		else if(parent1 == parent2)						//both fish are the same type
+			if(prob(90))									//90% chance to get that type of egg
+				egg_list.Add(parent1.egg_item)
+			else											//10% chance to get a dud
+				egg_list.Add(/obj/item/fish_eggs)
+		else											//different types of fish
+			if(prob(30))									//30% chance to get dud
+				egg_list.Add(/obj/item/fish_eggs)
+			else
+				if(prob(50))								//chance to get egg for either parent type (50/50 for either parent, 35% overall each)
+					egg_list.Add(parent1.egg_item)
+				else
+					egg_list.Add(parent2.egg_item)
+	egg_count++
+
 //////////////////////////////		Note from FalseIncarnate:
 //		EXAMINE PROC		//			This proc is massive, messy, and probably could be handled better.
 //////////////////////////////			Feel free to try cleaning it up if you think of a better way to do it.
@@ -464,9 +467,11 @@
 		var/fish_num = fish_count
 		var/message = "You spot "
 		while(fish_num > 0)
+			var/datum/fish/fish_type = fish_list[fish_num]
+			var/fish_name = fish_type.fish_name
 			if(fish_count > 1 && fish_num == 1)	//If there were at least 2 fish, and this is the last one, add "and" to the message
 				message += "and "
-			message += "a [fish_list[fish_num]]"
+			message += "\an [fish_name]"
 			fish_num --
 			if(fish_num > 0)					//There's more fish, add a comma to the message
 				message +=", "
@@ -645,13 +650,13 @@
 						return
 					else
 						message = "The filtration process purifies the water, raising the water level."
-						water_level += water_value
-						if(water_level == water_capacity)
+
+						if((water_level + water_value) == water_capacity)
 							message += " You filled \the [src] to the brim!"
-						if(water_level > water_capacity)
+						if((water_level + water_value) > water_capacity)
 							message += " You overfilled \the [src] and some water runs down the side, wasted."
 						C.reagents.clear_reagents()
-				check_water_level()
+						adjust_water_level(water_value)
 				user.visible_message("[user.name] pours the contents of [C.name] into \the [src].", "[message]")
 				return
 			//Empty containers will scoop out water, filling the container as much as possible from the water_level
@@ -661,13 +666,12 @@
 				else
 					if(water_level >= C.volume)										//Enough to fill the container completely
 						C.reagents.add_reagent("fishwater", C.volume)
-						water_level -= C.volume
+						adjust_water_level(-C.volume)
 						user.visible_message("[user.name] scoops out some water from \the [src].", "You completely fill [C.name] from \the [src].")
 					else															//Fill the container as much as possible with the water_level
 						C.reagents.add_reagent("fishwater", water_level)
-						water_level = 0
+						adjust_water_level(-water_level)
 						user.visible_message("[user.name] scoops out some water from \the [src].", "You fill [C.name] with the last of the water in \the [src].")
-					check_water_level()
 			return
 	//Wrenches can deconstruct empty tanks, but not tanks with any water. Kills any fish left inside and destroys any unharvested eggs in the process
 	if(istype(O, /obj/item/weapon/wrench))
@@ -702,12 +706,11 @@
 					user.visible_message("[user.name] shakes some fish food into the empty [src]... How sad.", "You shake some fish food into the empty [src]... If only it had fish.")
 				else
 					user.visible_message("[user.name] feeds the fish in \the [src]. The fish look excited!", "You feed the fish in \the [src]. They look excited!")
-				food_level += 10
+				adjust_food_level(10)
 			else
 				to_chat(usr, "[src] already has plenty of food in it. You decide to not add more.")
 		else
 			to_chat(usr, "[src] doesn't have any water in it. You should fill it with water first.")
-		check_food_level()
 		return
 	//Fish egg scoop
 	else if(istype(O, /obj/item/weapon/egg_scoop))
@@ -726,7 +729,7 @@
 		if(filth_level == 0)
 			to_chat(usr, "[src] is already spotless!")
 		else
-			filth_level = 0
+			adjust_filth_level(-filth_level)
 			user.visible_message("[user.name] scrubs the inside of \the [src], cleaning the filth.", "You scrub the inside of \the [src], cleaning the filth.")
 	else if(O && O.force)
 		user.visible_message("<span class='danger'>\The [src] has been attacked by [user.name] with \the [O]!</span>")

code/modules/flufftext/Hallucination.dm

@@ -847,7 +847,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
 //			to_chat(src, "Strange Audio")
 			switch(rand(1,18))
 				if(1)
-					playsound_local(null,'sound/machines/airlock.ogg', 15, 1)
+					playsound_local(null,'sound/machines/airlock_open.ogg', 15, 1)
 				if(2)
 					if(prob(50))
 						playsound_local(null,'sound/effects/Explosion1.ogg', 50, 1)

code/modules/food_and_drinks/drinks/bottler/bottler.dm

@@ -179,7 +179,7 @@
 		con_type = "glass bottle"
 		max_define = MAX_GLASS
 		mat_ratio = RATIO_GLASS
-	else if(istype(S, /obj/item/stack/sheet/mineral/plastic))
+	else if(istype(S, /obj/item/stack/sheet/plastic))
 		con_type = "plastic bottle"
 		max_define = MAX_PLAST
 		mat_ratio = RATIO_PLAST

code/modules/food_and_drinks/food/snacks.dm

@@ -717,6 +717,14 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 6, "vitamin" = 1)
 
+/obj/item/weapon/reagent_containers/food/snacks/baseballburger
+	name = "home run baseball burger"
+	desc = "It's still warm. The steam coming off of it looks like baseball."
+	icon_state = "baseball"
+	filling_color = "#CD853F"
+	bitesize = 3
+	list_reagents = list("nutriment" = 6, "vitamin" = 1)
+
 /obj/item/weapon/reagent_containers/food/snacks/omelette
 	name = "Omelette Du Fromage"
 	desc = "That's all you can say!"

code/modules/food_and_drinks/recipes/recipes_microwave.dm

@@ -126,6 +126,13 @@
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/mimeburger
 
+/datum/recipe/microwave/baseballburger
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/bun,
+		/obj/item/weapon/melee/baseball_bat
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/baseballburger
+
 /datum/recipe/microwave/hotdog
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/bun,

code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm

@@ -54,6 +54,15 @@
 	result = /obj/item/weapon/reagent_containers/food/snacks/jellyburger/cherry
 	category = CAT_FOOD
 
+/datum/crafting_recipe/baseballburger
+	name = "Home run baseball burger"
+	reqs = list(
+		/obj/item/weapon/melee/baseball_bat = 1,
+		/obj/item/weapon/reagent_containers/food/snacks/bun = 1,
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/baseballburger
+	category = CAT_FOOD
+
 /datum/crafting_recipe/notasandwich
 	name = "not-a-sandwich"
 	reqs = list(

code/modules/hydroponics/grown/mushrooms.dm

@@ -220,7 +220,7 @@
 	rarity = 20
 	genes = list(/datum/plant_gene/trait/glow, /datum/plant_gene/trait/plant_type/fungal_metabolism)
 	growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
-	mutatelist = list(/obj/item/seeds/glowshroom/glowcap)
+	mutatelist = list(/obj/item/seeds/glowshroom/glowcap, /obj/item/seeds/glowshroom/shadowshroom)
 	reagents_add = list("radium" = 0.1, "phosphorus" = 0.1, "nutriment" = 0.04)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom
@@ -235,14 +235,25 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
 	if(istype(user.loc, /turf/space))
-		return
-	var/obj/effect/glowshroom/planted = new effect_path(user.loc)
-	planted.delay = planted.delay - seed.production * 100 //So the delay goes DOWN with better stats instead of up. :I
-	planted.endurance = seed.endurance
-	planted.yield = seed.yield
-	planted.potency = seed.potency
+		return FALSE
+	if(!isturf(user.loc))
+		to_chat(user, "<span class='warning'>You need more space to plant [src].</span>")
+		return FALSE
+	var/count = 0
+	var/maxcount = 1
+	for(var/tempdir in cardinal)
+		var/turf/simulated/wall = get_step(user.loc, tempdir)
+		if(istype(wall))
+			maxcount++
+	for(var/obj/effect/glowshroom/G in user.loc)
+		count++
+	if(count >= maxcount)
+		to_chat(user, "<span class='warning'>There are too many shrooms here to plant [src].</span>")
+		return FALSE
+	new effect_path(user.loc, seed)
 	to_chat(user, "<span class='notice'>You plant [src].</span>")
 	qdel(src)
+	return TRUE
 
 
 // Glowcap
@@ -255,7 +266,7 @@
 	icon_dead = "glowshroom-dead"
 	plantname = "Glowcaps"
 	product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap
-	genes = list(/datum/plant_gene/trait/glow, /datum/plant_gene/trait/cell_charge, /datum/plant_gene/trait/plant_type/fungal_metabolism)
+	genes = list(/datum/plant_gene/trait/glow/red, /datum/plant_gene/trait/cell_charge, /datum/plant_gene/trait/plant_type/fungal_metabolism)
 	mutatelist = list()
 	reagents_add = list("teslium" = 0.1, "nutriment" = 0.04)
 	rarity = 30
@@ -263,7 +274,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap
 	seed = /obj/item/seeds/glowshroom/glowcap
 	name = "glowcap cluster"
-	desc = "<I>Mycena Ruthenia</I>: This species of mushroom glows in the dark, but aren't bioluminescent. They're warm to the touch..."
+	desc = "<I>Mycena Ruthenia</I>: This species of mushroom glows in the dark, but isn't actually bioluminescent. They're warm to the touch..."
 	icon_state = "glowcap"
 	filling_color = "#00FA9A"
 	effect_path = /obj/effect/glowshroom/glowcap
@@ -292,3 +303,26 @@
 	desc = "A fungus ideal for making antibacterials."
 	icon_state = "angel"
 	color = "#4f4331"
+
+//Shadowshroom
+/obj/item/seeds/glowshroom/shadowshroom
+	name = "pack of shadowshroom mycelium"
+	desc = "This mycelium will grow into something shadowy."
+	icon_state = "mycelium-shadowshroom"
+	species = "shadowshroom"
+	icon_grow = "shadowshroom-grow"
+	icon_dead = "shadowshroom-dead"
+	plantname = "Shadowshrooms"
+	product = /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom
+	genes = list(/datum/plant_gene/trait/glow/shadow, /datum/plant_gene/trait/plant_type/fungal_metabolism)
+	mutatelist = list()
+	reagents_add = list("radium" = 0.2, "nutriment" = 0.04)
+	rarity = 30
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom
+	seed = /obj/item/seeds/glowshroom/shadowshroom
+	name = "shadowshroom cluster"
+	desc = "<I>Mycena Umbra</I>: This species of mushroom emits shadow instead of light."
+	icon_state = "shadowshroom"
+	effect_path = /obj/effect/glowshroom/shadowshroom
+	origin_tech = "biotech=4;plasmatech=4;magnets=4"

code/modules/hydroponics/hydroponics.dm

@@ -300,7 +300,7 @@
 	if(!self_sustaining)
 		if(myseed && myseed.get_gene(/datum/plant_gene/trait/glow))
 			var/datum/plant_gene/trait/glow/G = myseed.get_gene(/datum/plant_gene/trait/glow)
-			set_light(G.get_lum(myseed))
+			set_light(G.glow_range(myseed), G.glow_power(myseed), G.glow_color)
 		else
 			set_light(0)
 

code/modules/hydroponics/plant_genes.dm

@@ -263,23 +263,40 @@
 
 /datum/plant_gene/trait/glow
 	// Makes plant glow. Makes plant in tray glow too.
-	// Adds potency*rate luminosity to products.
+	// Adds 1 + potency*rate light range and potency*(rate + 0.01) light_power to products.
 	name = "Bioluminescence"
-	rate = 0.1
+	rate = 0.03
 	examine_line = "<span class='info'>It emits a soft glow.</span>"
 	trait_id = "glow"
+	var/glow_color = "#AAD84B"
 
-/datum/plant_gene/trait/glow/proc/get_lum(obj/item/seeds/S)
-	return round(S.potency*rate)
+/datum/plant_gene/trait/glow/proc/glow_range(obj/item/seeds/S)
+	return 1.4 + S.potency*rate
+
+/datum/plant_gene/trait/glow/proc/glow_power(obj/item/seeds/S)
+	return max(S.potency*(rate + 0.01), 0.1)
 
 /datum/plant_gene/trait/glow/on_new(obj/item/weapon/reagent_containers/food/snacks/grown/G, newloc)
 	..()
-	G.set_light(get_lum(G.seed))
+	G.set_light(glow_range(G.seed), glow_power(G.seed), glow_color)
+
+/datum/plant_gene/trait/glow/shadow
+	//makes plant emit slightly purple shadows
+	//adds -potency*(rate*0.05) light power to products
+	name = "Shadow Emission"
+	rate = 0.04
+
+/datum/plant_gene/trait/glow/shadow/glow_power(obj/item/seeds/S)
+	return -max(S.potency*(rate*0.05), 0.075)
+
+/datum/plant_gene/trait/glow/red
+	name = "Red Electrical Glow"
+	glow_color = LIGHT_COLOR_RED
 
 /datum/plant_gene/trait/glow/berry
 	name = "Strong Bioluminescence"
-	rate = 0.2
-
+	rate = 0.05
+	glow_color = null
 
 /datum/plant_gene/trait/teleport
 	// Makes plant teleport people when squashed or slipped on.

code/modules/mining/equipment_locker.dm

@@ -112,6 +112,8 @@
 		return
 	if(panel_open)
 		if(istype(W, /obj/item/weapon/crowbar))
+			if(inserted_id)
+				inserted_id.forceMove(loc) //Prevents deconstructing the ORM from deleting whatever ID was inside it.
 			empty_content()
 			default_deconstruction_crowbar(W)
 		if(ismultitool(W))
@@ -304,6 +306,9 @@
 /obj/machinery/mineral/ore_redemption/power_change()
 	..()
 	update_icon()
+	if(inserted_id && !powered())
+		visible_message("<span class='notice'>The ID slot indicator light flickers on \the [src] as it spits out a card before powering down.</span>")
+		inserted_id.forceMove(loc)
 
 /obj/machinery/mineral/ore_redemption/update_icon()
 	if(powered())
@@ -387,6 +392,9 @@
 /obj/machinery/mineral/equipment_vendor/power_change()
 	..()
 	update_icon()
+	if(inserted_id && !powered())
+		visible_message("<span class='notice'>The ID slot indicator light flickers on \the [src] as it spits out a card before powering down.</span>")
+		inserted_id.forceMove(loc)
 
 /obj/machinery/mineral/equipment_vendor/update_icon()
 	if(powered())
@@ -456,6 +464,8 @@
 		return
 	if(panel_open)
 		if(istype(I, /obj/item/weapon/crowbar))
+			if(inserted_id)
+				inserted_id.forceMove(loc) //Prevents deconstructing the ORM from deleting whatever ID was inside it.
 			default_deconstruction_crowbar(I)
 		return 1
 	if(istype(I, /obj/item/weapon/mining_voucher))

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

@@ -52,7 +52,7 @@
 	UpdateAppearance()
 
 /mob/living/carbon/human/OpenCraftingMenu()
-	handcrafting.craft(src)
+	handcrafting.ui_interact(src)
 
 /mob/living/carbon/human/prepare_data_huds()
 	//Update med hud images...

code/modules/mob/living/silicon/robot/drone/drone.dm

@@ -15,7 +15,7 @@
 	req_access = list(access_engine, access_robotics)
 	ventcrawler = 2
 	magpulse = 1
-	
+
 	default_language = "Drone"
 
 	// We need to keep track of a few module items so we don't need to do list operations
@@ -23,7 +23,7 @@
 	var/obj/item/stack/sheet/metal/cyborg/stack_metal = null
 	var/obj/item/stack/sheet/wood/stack_wood = null
 	var/obj/item/stack/sheet/glass/cyborg/stack_glass = null
-	var/obj/item/stack/sheet/mineral/plastic/cyborg/stack_plastic = null
+	var/obj/item/stack/sheet/plastic/stack_plastic = null
 	var/obj/item/weapon/matter_decompiler/decompiler = null
 
 	//Used for self-mailing.
@@ -43,7 +43,7 @@
 	remove_language("Galactic Common")
 	add_language("Drone Talk", 1)
 	add_language("Drone", 1)
-	
+
 	// Disable the microphone wire on Drones
 	if(radio)
 		radio.wires.CutWireIndex(WIRE_TRANSMIT)
@@ -70,7 +70,7 @@
 	stack_metal = locate(/obj/item/stack/sheet/metal/cyborg) in src.module
 	stack_wood = locate(/obj/item/stack/sheet/wood) in src.module
 	stack_glass = locate(/obj/item/stack/sheet/glass/cyborg) in src.module
-	stack_plastic = locate(/obj/item/stack/sheet/mineral/plastic/cyborg) in src.module
+	stack_plastic = locate(/obj/item/stack/sheet/plastic) in src.module
 
 	//Grab decompiler.
 	decompiler = locate(/obj/item/weapon/matter_decompiler) in src.module

code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -46,7 +46,7 @@
 //		/obj/item/weapon/paper_bundle,
 		/obj/item/weapon/card/id
 		)
-		
+
 /obj/item/weapon/gripper/New()
 	..()
 	can_hold = typecacheof(can_hold)
@@ -374,7 +374,7 @@
 					stack = stack_wood
 				if("plastic")
 					if(!stack_plastic)
-						stack_plastic = new /obj/item/stack/sheet/mineral/plastic/cyborg(src.module)
+						stack_plastic = new /obj/item/stack/sheet/plastic(src.module)
 						stack_plastic.amount = 1
 					stack = stack_plastic
 

code/modules/mob/living/simple_animal/hostile/statue.dm

@@ -39,6 +39,7 @@
 
 	search_objects = 1 // So that it can see through walls
 
+	see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
 	sight = SEE_SELF|SEE_MOBS|SEE_OBJS|SEE_TURFS
 	anchored = 1
 	status_flags = GODMODE // Cannot push also
@@ -56,9 +57,6 @@
 	AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/blindness(null))
 	AddSpell(new /obj/effect/proc_holder/spell/targeted/night_vision(null))
 
-	// Give nightvision
-	see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
-
 	// Set creator
 	if(creator)
 		src.creator = creator
@@ -190,7 +188,7 @@
 
 //Toggle Night Vision
 /obj/effect/proc_holder/spell/targeted/night_vision
-	name = "Toggle Nightvision \[ON\]"
+	name = "Toggle Nightvision"
 	desc = "Toggle your nightvision mode."
 
 	charge_max = 10
@@ -199,17 +197,15 @@
 	message = "<span class='notice'>You toggle your night vision!</span>"
 	range = -1
 	include_user = 1
+	var/non_night_vision = SEE_INVISIBLE_LIVING
+	var/night_vision = SEE_INVISIBLE_OBSERVER_NOLIGHTING
 
 /obj/effect/proc_holder/spell/targeted/night_vision/cast(list/targets, mob/user = usr)
-
 	for(var/mob/living/target in targets)
-		if(target.see_invisible == SEE_INVISIBLE_LIVING)
-			target.see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
-			name = "Toggle Nightvision \[ON\]"
+		if(target.see_invisible == non_night_vision)
+			target.see_invisible = night_vision
 		else
-			target.see_invisible = SEE_INVISIBLE_LIVING
-			name = "Toggle Nightvision \[OFF\]"
-	return
+			target.see_invisible = non_night_vision
 
 /mob/living/simple_animal/hostile/statue/sentience_act()
 	faction -= "neutral"

code/modules/mob/living/simple_animal/posessed_object.dm

@@ -13,12 +13,11 @@
 	universal_speak = 1		// Tell the humans spooky things about the afterlife
 	speak_emote = list("mumbles", "moans", "whispers", "laments", "screeches")
 
-	allow_spin = 0			// No spinning. Spinning breaks our floating animation and broken floating animations make ghosts SUPER ANGRY.
+	allow_spin = 0			// No spinning. Spinning breaks our floating animation.
 	no_spin_thrown = 1
 
 	var/obj/item/possessed_item
 
-
 /mob/living/simple_animal/possessed_object/examine(mob/user)
 	possessed_item.examine(user)
 	if(health > (maxHealth / 30))
@@ -47,15 +46,17 @@
 
 
 /mob/living/simple_animal/possessed_object/death(gibbed)
+	var/mob/dead/observer/ghost = ghostize(1)
 	..()
 
 	if(gibbed) // Leave no trace.
-		var/mob/dead/observer/ghost = ghostize(1)
 		ghost.timeofdeath = world.time
 		qdel(src)
 		return
 
-	possessed_item.forceMove(loc) // Put the normal item back once the EVIL SPIRIT has been vanquished from it.
+	if(possessed_item.loc == src)
+		possessed_item.forceMove(loc) // Put the normal item back once the EVIL SPIRIT has been vanquished from it. If it's not already in place
+
 	qdel(src)
 
 
@@ -65,15 +66,23 @@
 	if(!possessed_item) // If we're a donut and someone's eaten us, for instance.
 		death(1)
 
-	if(possessed_item.loc != src)
-		forceMove(possessed_item.loc)
-		possessed_item.forceMove(src)
+	if( possessed_item.loc != src )
+		if ( isturf(possessed_item.loc) ) // If we've, say, placed the possessed item on the table move onto the table ourselves instead and put it back inside of us.
+			forceMove(possessed_item.loc)
+			possessed_item.forceMove(src)
+		else // If we're inside a toolbox or something, we are inside the item rather than the item inside us. This is so people can see the item in the toolbox.
+			forceMove( possessed_item )
 
 	if(l_hand) // Incase object interactions put things directly into our hands. (Like cameras, or gun magizines)
 		drop_l_hand()
 	if(r_hand)
 		drop_r_hand()
 
+/mob/living/simple_animal/possessed_object/Login()
+	..()
+	to_chat(src, "<span class='shadowling'><b>Your spirit has entered [src] and possessed it.</b><br>You are able to do most things a humanoid would be able to do with a [src] in their hands.<br>If you want to end your ghostly possession, use the '<b>ghost</b>' verb, it won't penalize your ability to respawn.</span>")
+
+
 /mob/living/simple_animal/possessed_object/New(var/atom/loc as obj)
 	..()
 
@@ -89,23 +98,14 @@
 		qdel(src)
 
 	possessed_item = loc
-	forceMove(possessed_loc)
+	forceMove( possessed_loc )
 	possessed_item.forceMove(src) // We'll keep the actual item inside of us until we die.
 
-	zone_sel = new /obj/screen/zone_sel(src) // Create a new zone selection item so the human attacks have something to reference.
+	zone_sel = new /obj/screen/zone_sel(src) // Create a new zone selection item so the human attacks have something to reference. Horrifying and ugly hack, do not look directly at this.
 
-	name = possessed_item.name // Take on all the attributes of the item we've possessed.
-	real_name = name
-	desc = possessed_item.desc
-	icon = possessed_item.icon
-	icon_living = possessed_item.icon_state
-	icon_state = possessed_item.icon_state
-	dir = possessed_item.dir
-	color = possessed_item.color
-	overlays = possessed_item.overlays
-	set_opacity(possessed_item.opacity)
+	update_icon(1)
 
-	visible_message("<span class='warning'>[src] rises into the air and begins to float!</span>") // Inform those around us that shit's gettin' spooky.
+	visible_message("<span class='shadowling'>[src] rises into the air and begins to float!</span>") // Inform those around us that shit's gettin' spooky.
 	animate_ghostly_presence(src, -1, 20, 1)
 
 
@@ -138,17 +138,26 @@
 	else
 		..()
 
-	if(possessed_item.loc != src) // If we've, say, placed the possessed item on the table move onto the table ourselves instead and put it back inside of us.
-		forceMove(possessed_item.loc)
-		possessed_item.forceMove(src)
+	if( possessed_item.loc != src )
+		if ( isturf(possessed_item.loc) ) // If we've, say, placed the possessed item on the table move onto the table ourselves instead and put it back inside of us.
+			forceMove(possessed_item.loc)
+			possessed_item.forceMove(src)
+		else // If we're inside a toolbox or something, we are inside the item rather than the item inside us. This is so people can see the item in the toolbox.
+			forceMove( possessed_item )
 
-	name = possessed_item.name // Update our status
+	update_icon()
+
+/mob/living/simple_animal/possessed_object/proc/update_icon(update_pixel_xy = 0)
+	name = possessed_item.name // Take on all the attributes of the item we've possessed.
 	real_name = name
 	desc = possessed_item.desc
 	icon = possessed_item.icon
 	icon_living = possessed_item.icon_state
 	icon_state = possessed_item.icon_state
 	dir = possessed_item.dir
+	if(update_pixel_xy)
+		pixel_x = possessed_item.pixel_x
+		pixel_y = possessed_item.pixel_y
 	color = possessed_item.color
 	overlays = possessed_item.overlays
-	opacity = possessed_item.opacity
+	set_opacity(possessed_item.opacity)

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -712,16 +712,17 @@
 /mob/living/simple_animal/proc/sentience_act() //Called when a simple animal gains sentience via gold slime potion
 	return
 
-/mob/living/simple_animal/update_sight()
+/mob/living/simple_animal/update_sight(reset_sight = FALSE)
 	if(!client)
 		return
 	if(stat == DEAD)
 		grant_death_vision()
 		return
 
-	see_invisible = initial(see_invisible)
-	see_in_dark = initial(see_in_dark)
-	sight = initial(sight)
+	if(reset_sight)
+		see_invisible = initial(see_invisible)
+		see_in_dark = initial(see_in_dark)
+		sight = initial(sight)
 
 	if(client.eye != src)
 		var/atom/A = client.eye

code/modules/mob/new_player/sprite_accessories.dm

@@ -1151,13 +1151,13 @@
 ///////////////////////////
 /datum/sprite_accessory/underwear
 	icon = 'icons/mob/underwear.dmi'
-	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skeleton", "Drask")
+	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Slime People", "Skeleton", "Drask")
 	gender = NEUTER
 
 /datum/sprite_accessory/underwear/nude
 	name = "Nude"
 	icon_state = null
-	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skeleton", "Drask", "Vox")
+	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Slime People", "Skeleton", "Drask", "Vox")
 
 /datum/sprite_accessory/underwear/male
 	gender = MALE
@@ -1277,13 +1277,13 @@
 ////////////////////////////
 /datum/sprite_accessory/undershirt
 	icon = 'icons/mob/underwear.dmi'
-	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skeleton", "Drask")
+	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Slime People", "Skeleton", "Drask")
 	gender = NEUTER
 
 /datum/sprite_accessory/undershirt/nude
 	name = "Nude"
 	icon_state = null
-	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skeleton", "Drask", "Vox")
+	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Slime People", "Skeleton", "Drask", "Vox")
 
 //plain color shirts
 /datum/sprite_accessory/undershirt/shirt_white
@@ -1513,13 +1513,13 @@
 ///////////////////////
 /datum/sprite_accessory/socks
 	icon = 'icons/mob/underwear.dmi'
-	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skeleton", "Drask")
+	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Slime People", "Skeleton", "Drask")
 	gender = NEUTER
 
 /datum/sprite_accessory/socks/nude
 	name = "Nude"
 	icon_state = null
-	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skeleton", "Drask", "Vox")
+	species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Slime People", "Skeleton", "Drask", "Vox")
 
 /datum/sprite_accessory/socks/white_norm
 	name = "Normal White"

code/modules/nano/interaction/not_incapacitated.dm

@@ -0,0 +1,25 @@
+ /**
+  * This state only checks if the user isn't incapacitated
+ **/
+
+/var/global/datum/topic_state/not_incapacitated_state/not_incapacitated_state = new()
+
+ /**
+  * This state checks if the user isn't incapacitated and that their loc is a turf
+ **/
+
+/var/global/datum/topic_state/not_incapacitated_state/not_incapacitated_turf_state = new(no_turfs = TRUE)
+
+/datum/topic_state/not_incapacitated_state
+	var/turf_check = FALSE
+
+/datum/topic_state/not_incapacitated_state/New(loc, no_turfs = FALSE)
+	..()
+	turf_check = no_turfs
+
+/datum/topic_state/not_incapacitated_state/can_use_topic(src_object, mob/user)
+	if(user.stat)
+		return STATUS_CLOSE
+	if(user.incapacitated() || user.lying || (turf_check && !isturf(user.loc)))
+		return STATUS_DISABLED
+	return STATUS_INTERACTIVE

code/modules/power/lighting.dm

@@ -139,7 +139,7 @@
 	var/on_gs = 0
 	var/static_power_used = 0
 	var/brightness_range = 8	// luminosity when on, also used in power calculation
-	var/brightness_power = 3
+	var/brightness_power = 1
 	var/brightness_color = null
 	var/status = LIGHT_OK		// LIGHT_OK, _EMPTY, _BURNED or _BROKEN
 	var/flickering = 0
@@ -157,7 +157,6 @@
 	base_state = "bulb"
 	fitting = "bulb"
 	brightness_range = 4
-	brightness_power = 2
 	brightness_color = "#a0a080"
 	desc = "A small lighting fixture."
 	light_type = /obj/item/weapon/light/bulb
@@ -190,12 +189,10 @@
 		switch(fitting)
 			if("tube")
 				brightness_range = 8
-				brightness_power = 3
 				if(prob(2))
 					broken(1)
 			if("bulb")
 				brightness_range = 4
-				brightness_power = 2
 				brightness_color = "#a0a080"
 				if(prob(5))
 					broken(1)
@@ -608,13 +605,12 @@
 	item_state = "c_tube"
 	materials = list(MAT_GLASS=100)
 	brightness_range = 8
-	brightness_power = 3
 
 /obj/item/weapon/light/tube/large
 	w_class = 2
 	name = "large light tube"
 	brightness_range = 15
-	brightness_power = 4
+	brightness_power = 2
 
 /obj/item/weapon/light/bulb
 	name = "light bulb"
@@ -624,7 +620,6 @@
 	item_state = "contvapour"
 	materials = list(MAT_GLASS=100)
 	brightness_range = 5
-	brightness_power = 2
 	brightness_color = "#a0a080"
 
 /obj/item/weapon/light/throw_impact(atom/hit_atom)
@@ -639,7 +634,6 @@
 	item_state = "egg4"
 	materials = list(MAT_GLASS=100)
 	brightness_range = 5
-	brightness_power = 2
 
 // update the icon state and description of the light
 

code/modules/power/singularity/particle_accelerator/particle_control.dm

@@ -68,11 +68,8 @@
 		if(stat & NOPOWER)
 			icon_state = "[reference]w"
 			return
-		else if(use_power)
-			if(assembled)
-				icon_state = "[reference]p"
-			else
-				icon_state = "u[reference]p"
+		else if(use_power && assembled)
+			icon_state = "[reference]p"
 		else
 			switch(construction_state)
 				if(0)

code/modules/reagents/chemistry/reagents/medicine.dm

@@ -617,6 +617,9 @@
 	..()
 
 /datum/reagent/medicine/strange_reagent/reaction_mob(mob/living/M, method=TOUCH, volume)
+	if(volume < 1)
+		// gotta pay to play
+		return ..()
 	if(isanimal(M))
 		if(method == TOUCH)
 			var/mob/living/simple_animal/SM = M
@@ -628,10 +631,11 @@
 	if(iscarbon(M))
 		if(method == INGEST)
 			if(M.stat == DEAD)
-				if(M.getBruteLoss()+M.getFireLoss() >= 150)
+				if(M.getBruteLoss()+M.getFireLoss()+M.getCloneLoss() >= 150)
 					M.visible_message("<span class='warning'>[M]'s body starts convulsing!</span>")
 					M.gib()
 					return
+				M.adjustCloneLoss(50)
 				var/mob/dead/observer/ghost = M.get_ghost()
 				if(ghost)
 					to_chat(ghost, "<span class='ghostalert'>You are attempting to be revived with Strange Reagent. Return to your body if you want to be revived!</span> (Verbs -> Ghost -> Re-enter corpse)")
@@ -639,11 +643,26 @@
 					ghost << sound('sound/effects/genetics.ogg')
 					M.visible_message("<span class='notice'>[M] doesn't appear to respond, perhaps try again later?</span>")
 				if(!M.suiciding && !ghost && !(NOCLONE in M.mutations))
+					var/time_dead = world.time - M.timeofdeath
 					M.visible_message("<span class='warning'>[M] seems to rise from the dead!</span>")
 					M.setOxyLoss(0)
 					M.adjustBruteLoss(rand(0,15))
 					M.adjustToxLoss(rand(0,15))
 					M.adjustFireLoss(rand(0,15))
+					if(ishuman(M))
+						var/mob/living/carbon/human/H = M
+						var/necrosis_prob = 40 * min((20 MINUTES), max((time_dead - (1 MINUTES)), 0)) / ((20 MINUTES) - (1 MINUTES))
+						for(var/obj/item/organ/O in (H.organs | H.internal_organs))
+							// Per non-vital body part:
+							// 0% chance of necrosis within 1 minute of death
+							// 40% chance of necrosis after 20 minutes of death
+							if(!O.vital && prob(necrosis_prob))
+								// side effects may include: Organ failure
+								O.necrotize(FALSE)
+								if(O.status & ORGAN_DEAD)
+									O.germ_level = INFECTION_LEVEL_THREE
+						H.update_body()
+
 					M.update_revive()
 					M.stat = UNCONSCIOUS
 					add_logs(M, M, "revived", object="strange reagent") //Yes, the logs say you revived yourself.
@@ -1003,4 +1022,4 @@
 
 /datum/reagent/medicine/earthsblood/overdose_process(mob/living/M)
 	M.SetHallucinate(min(max(0, M.hallucination + 10), 50))
-	M.adjustToxLoss(5 * REAGENTS_EFFECT_MULTIPLIER)
+	M.adjustToxLoss(5 * REAGENTS_EFFECT_MULTIPLIER)

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

@@ -101,7 +101,7 @@
 	result_amount = 1
 
 /datum/chemical_reaction/plastication/on_reaction(datum/reagents/holder)
-	var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/mineral/plastic
+	var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/plastic
 	M.amount = 10
 	M.forceMove(get_turf(holder.my_atom))
 

code/modules/recycling/conveyor2.dm

@@ -256,9 +256,9 @@
 /obj/machinery/conveyor_switch/attack_hand(mob/user)
 	if(..())
 		return 1
-		
+
 	toggle(user)
-	
+
 /obj/machinery/conveyor_switch/attack_ghost(mob/user)
 	if(user.can_advanced_admin_interact())
 		toggle(user)
@@ -292,7 +292,7 @@
 			S.position = position
 			S.update()
 		CHECK_TICK
-		
+
 /obj/machinery/conveyor_switch/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/crowbar))
 		var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc)
@@ -309,7 +309,12 @@
 /obj/machinery/conveyor_switch/multitool_topic(var/mob/user,var/list/href_list,var/obj/O)
 	..()
 	if("toggle_logic" in href_list)
-		convdir = !convdir //reverses?
+		if(convdir)
+			convdir = 0
+		else if(last_pos)
+			convdir = last_pos
+		else
+			convdir = position
 
 
 /obj/machinery/conveyor_switch/multitool_menu(var/mob/user, var/obj/item/device/multitool/P)

code/modules/research/designs/medical_designs.dm

@@ -165,7 +165,7 @@
 	req_tech = list("biotech" = 2, "materials" = 2, "magnets" = 2)
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 2000, MAT_GLASS = 1500)
-	build_path = /obj/item/weapon/scalpel/laser1
+	build_path = /obj/item/weapon/scalpel/laser/laser1
 	category = list("Medical")
 
 /datum/design/item/scalpel_laser2
@@ -175,7 +175,7 @@
 	req_tech = list("biotech" = 3, "materials" = 4, "magnets" = 4)
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_SILVER = 1000)
-	build_path = /obj/item/weapon/scalpel/laser2
+	build_path = /obj/item/weapon/scalpel/laser/laser2
 	category = list("Medical")
 
 /datum/design/item/scalpel_laser3
@@ -185,7 +185,7 @@
 	req_tech = list("biotech" = 4, "materials" = 6, "magnets" = 5)
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 2000, MAT_GLASS = 1500, MAT_SILVER = 1000, MAT_GOLD = 1000)
-	build_path = /obj/item/weapon/scalpel/laser3
+	build_path = /obj/item/weapon/scalpel/laser/laser3
 	category = list("Medical")
 
 /datum/design/item/scalpel_manager
@@ -195,7 +195,7 @@
 	req_tech = list("biotech" = 4, "materials" = 7, "magnets" = 5, "programming" = 4)
 	build_type = PROTOLATHE
 	materials = list (MAT_METAL = 2000, MAT_GLASS = 1500, MAT_SILVER = 1000, MAT_GOLD = 1000, MAT_DIAMOND = 1000)
-	build_path = /obj/item/weapon/scalpel/manager
+	build_path = /obj/item/weapon/scalpel/laser/manager
 	category = list("Medical")
 
 /datum/design/alienscalpel

code/modules/research/designs/power_designs.dm

@@ -11,7 +11,7 @@
 	materials = list(MAT_METAL = 700, MAT_GLASS = 50)
 	construction_time=100
 	build_path = /obj/item/weapon/stock_parts/cell
-	category = list("Misc","Power")
+	category = list("Misc","Power","Machinery","initial")
 
 /datum/design/high_cell
 	name = "High-Capacity Power Cell"

code/modules/research/designs/stock_parts_designs.dm

@@ -10,7 +10,7 @@
 	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(MAT_METAL = 50, MAT_GLASS = 50)
 	build_path = /obj/item/weapon/stock_parts/capacitor
-	category = list("Stock Parts")
+	category = list("Stock Parts","Machinery","initial")
 	lathe_time_factor = 5
 
 /datum/design/basic_sensor
@@ -21,7 +21,7 @@
 	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(MAT_METAL = 50, MAT_GLASS = 20)
 	build_path = /obj/item/weapon/stock_parts/scanning_module
-	category = list("Stock Parts")
+	category = list("Stock Parts","Machinery","initial")
 	lathe_time_factor = 5
 
 /datum/design/micro_mani
@@ -32,7 +32,7 @@
 	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(MAT_METAL = 30)
 	build_path = /obj/item/weapon/stock_parts/manipulator
-	category = list("Stock Parts")
+	category = list("Stock Parts","Machinery","initial")
 	lathe_time_factor = 5
 
 /datum/design/basic_micro_laser
@@ -43,7 +43,7 @@
 	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(MAT_METAL = 10, MAT_GLASS = 20)
 	build_path = /obj/item/weapon/stock_parts/micro_laser
-	category = list("Stock Parts")
+	category = list("Stock Parts","Machinery","initial")
 	lathe_time_factor = 5
 
 /datum/design/basic_matter_bin
@@ -54,7 +54,7 @@
 	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(MAT_METAL = 80)
 	build_path = /obj/item/weapon/stock_parts/matter_bin
-	category = list("Stock Parts")
+	category = list("Stock Parts","Machinery","initial")
 	lathe_time_factor = 5
 
 /datum/design/adv_capacitor

code/modules/shuttle/supply.dm

@@ -662,6 +662,13 @@
 			investigate_log("[key_name(usr)] has sent the supply shuttle away. Remaining points: [shuttle_master.points]. Shuttle contents: [shuttle_master.sold_atoms]", "cargo")
 		else if(!shuttle_master.supply.request(shuttle_master.getDock("supply_home")))
 			post_signal("supply")
+			if(LAZYLEN(shuttle_master.shoppinglist) && prob(10))
+				var/datum/supply_order/O = new /datum/supply_order()
+				O.ordernum = shuttle_master.ordernum
+				O.object = shuttle_master.supply_packs[pick(shuttle_master.supply_packs)]
+				O.orderedby = random_name(pick(MALE,FEMALE), species = "Human")
+				shuttle_master.shoppinglist += O
+				investigate_log("Random [O.object] crate added to supply shuttle")
 
 	else if(href_list["doorder"])
 		if(world.time < reqtime)
@@ -789,6 +796,54 @@
 		/mob/living/silicon/robot/drone,
 		/mob/living/simple_animal/bot/mulebot
 		)
+	var/state = PLASTIC_FLAPS_NORMAL
+	var/can_deconstruct = TRUE
+
+/obj/structure/plasticflaps/examine(mob/user)
+	. = ..()
+	switch(state)
+		if(PLASTIC_FLAPS_NORMAL)
+			to_chat(user, "<span class='notice'>[src] are <b>screwed</b> to the floor.</span>")
+		if(PLASTIC_FLAPS_DETACHED)
+			to_chat(user, "<span class='notice'>[src] are no longer <i>screwed</i> to the floor, and the flaps can be <b>sliced</b> apart.</span>")
+
+/obj/structure/plasticflaps/attackby(obj/item/W, mob/user, params)
+	add_fingerprint(user)
+	if(isscrewdriver(W))
+		if(state == PLASTIC_FLAPS_NORMAL)
+			playsound(loc, W.usesound, 100, 1)
+			user.visible_message("<span class='warning'>[user] unscrews [src] from the floor.</span>", "<span class='notice'>You start to unscrew [src] from the floor...</span>", "You hear rustling noises.")
+			if(do_after(user, 180*W.toolspeed, target = src))
+				if(state != PLASTIC_FLAPS_NORMAL)
+					return
+				state = PLASTIC_FLAPS_DETACHED
+				anchored = FALSE
+				to_chat(user, "<span class='notice'>You unscrew [src] from the floor.</span>")
+		else if(state == PLASTIC_FLAPS_DETACHED)
+			playsound(loc, W.usesound, 100, 1)
+			user.visible_message("<span class='warning'>[user] screws [src] to the floor.</span>", "<span class='notice'>You start to screw [src] to the floor...</span>", "You hear rustling noises.")
+			if(do_after(user, 40*W.toolspeed, target = src))
+				if(state != PLASTIC_FLAPS_DETACHED)
+					return
+				state = PLASTIC_FLAPS_NORMAL
+				anchored = TRUE
+				to_chat(user, "<span class='notice'>You screw [src] from the floor.</span>")
+	else if(iswelder(W))
+		if(state == PLASTIC_FLAPS_DETACHED)
+			var/obj/item/weapon/weldingtool/WT = W
+			if(!WT.remove_fuel(0, user))
+				return
+			playsound(loc, WT.usesound, 100, 1)
+			user.visible_message("<span class='warning'>[user] slices apart [src].</span>", "<span class='notice'>You start to slice apart [src].</span>", "You hear welding.")
+			if(do_after(user, 120*WT.toolspeed, target = src))
+				if(state != PLASTIC_FLAPS_DETACHED)
+					return
+				to_chat(user, "<span class='notice'>You slice apart [src].</span>")
+				var/obj/item/stack/sheet/plastic/five/P = new(loc)
+				P.add_fingerprint(user)
+				qdel(src)
+	else
+		. = ..()
 
 /obj/structure/plasticflaps/CanPass(atom/A, turf/T)
 	if(istype(A) && A.checkpass(PASSGLASS))
@@ -844,6 +899,11 @@
 			if(prob(5))
 				qdel(src)
 
+/obj/structure/plasticflaps/proc/deconstruct(disassembled = TRUE)
+	if(can_deconstruct)
+		new /obj/item/stack/sheet/plastic/five(loc)
+	qdel(src)
+
 /obj/structure/plasticflaps/mining //A specific type for mining that doesn't allow airflow because of them damn crates
 	name = "\improper Airtight plastic flaps"
 	desc = "Heavy duty, airtight, plastic flaps."

code/modules/surgery/encased.dm

@@ -70,7 +70,7 @@
 /datum/surgery_step/open_encased/retract
 	name = "retract bone"
 	allowed_tools = list(
-	/obj/item/weapon/scalpel/manager = 120, \
+	/obj/item/weapon/scalpel/laser/manager = 100, \
 	/obj/item/weapon/retractor = 100, 	\
 	/obj/item/weapon/crowbar = 75
 	)
@@ -121,7 +121,7 @@
 /datum/surgery_step/open_encased/close
 	name = "unretract bone" //i suck at names okay? give me a new one
 	allowed_tools = list(
-	/obj/item/weapon/scalpel/manager = 120, \
+	/obj/item/weapon/scalpel/laser/manager = 100, \
 	/obj/item/weapon/retractor = 100, 	\
 	/obj/item/weapon/crowbar = 75
 	)

code/modules/surgery/face.dm

@@ -28,10 +28,6 @@
 /datum/surgery_step/generic/cut_face
 	name = "make incision"
 	allowed_tools = list(
-	/obj/item/weapon/scalpel/laser3 = 115, \
-	/obj/item/weapon/scalpel/laser2 = 110, \
-	/obj/item/weapon/scalpel/laser1 = 105, \
-	/obj/item/weapon/scalpel/manager = 120, \
 	/obj/item/weapon/scalpel = 100,		\
 	/obj/item/weapon/kitchen/knife = 75,	\
 	/obj/item/weapon/shard = 50, 		\
@@ -62,7 +58,7 @@
 /datum/surgery_step/face/mend_vocal
 	name = "mend vocal cords"
 	allowed_tools = list(
-	/obj/item/weapon/scalpel/manager = 120, \
+	/obj/item/weapon/scalpel/laser/manager = 100, \
 	/obj/item/weapon/hemostat = 100, 	\
 	/obj/item/stack/cable_coil = 75, 	\
 	/obj/item/device/assembly/mousetrap = 10	//I don't know. Don't ask me. But I'm leaving it because hilarity.
@@ -89,7 +85,7 @@
 /datum/surgery_step/face/fix_face
 	name = "reshape face"
 	allowed_tools = list(
-	/obj/item/weapon/scalpel/manager = 120, \
+	/obj/item/weapon/scalpel/laser/manager = 100, \
 	/obj/item/weapon/retractor = 100, 	\
 	/obj/item/weapon/crowbar = 55,	\
 	/obj/item/weapon/kitchen/utensil/fork = 75)
@@ -116,9 +112,7 @@
 /datum/surgery_step/face/cauterize
 	name = "close incision"
 	allowed_tools = list(
-	/obj/item/weapon/scalpel/laser3 = 115, \
-	/obj/item/weapon/scalpel/laser2 = 110, \
-	/obj/item/weapon/scalpel/laser1 = 105, \
+	/obj/item/weapon/scalpel/laser = 100, \
 	/obj/item/weapon/cautery = 100,			\
 	/obj/item/clothing/mask/cigarette = 75,	\
 	/obj/item/weapon/lighter = 50,			\

code/modules/surgery/generic.dm

@@ -23,10 +23,6 @@
 	name = "make incision"
 
 	allowed_tools = list(
-	/obj/item/weapon/scalpel/laser3 = 115, \
-	/obj/item/weapon/scalpel/laser2 = 110, \
-	/obj/item/weapon/scalpel/laser1 = 105, \
-	/obj/item/weapon/scalpel/manager = 120, \
 	/obj/item/weapon/scalpel = 100,		\
 	/obj/item/weapon/kitchen/knife = 75,	\
 	/obj/item/weapon/shard = 50, 		\
@@ -65,10 +61,7 @@
 	name = "clamp bleeders"
 
 	allowed_tools = list(
-	/obj/item/weapon/scalpel/laser3 = 115, \
-	/obj/item/weapon/scalpel/laser2 = 110, \
-	/obj/item/weapon/scalpel/laser1 = 105, \
-	/obj/item/weapon/scalpel/manager = 120, \
+	/obj/item/weapon/scalpel/laser = 100, \
 	/obj/item/weapon/hemostat = 100,	\
 	/obj/item/stack/cable_coil = 75, 	\
 	/obj/item/device/assembly/mousetrap = 20
@@ -103,7 +96,7 @@
 	name = "retract skin"
 
 	allowed_tools = list(
-	/obj/item/weapon/scalpel/manager = 120, \
+	/obj/item/weapon/scalpel/laser/manager = 100, \
 	/obj/item/weapon/retractor = 100, 	\
 	/obj/item/weapon/crowbar = 75,	\
 	/obj/item/weapon/kitchen/utensil/fork = 50
@@ -158,9 +151,7 @@
 	name = "cauterize incision"
 
 	allowed_tools = list(
-	/obj/item/weapon/scalpel/laser3 = 115, \
-	/obj/item/weapon/scalpel/laser2 = 110, \
-	/obj/item/weapon/scalpel/laser1 = 105, \
+	/obj/item/weapon/scalpel/laser = 100, \
 	/obj/item/weapon/cautery = 100,			\
 	/obj/item/clothing/mask/cigarette = 75,	\
 	/obj/item/weapon/lighter = 50,			\

code/modules/surgery/implant.dm

@@ -97,10 +97,7 @@
 /datum/surgery_step/cavity/close_space
 	name = "close cavity space"
 	allowed_tools = list(
-	/obj/item/weapon/scalpel/laser3 = 115, \
-	/obj/item/weapon/scalpel/laser2 = 110, \
-	/obj/item/weapon/scalpel/laser1 = 105, \
-	/obj/item/weapon/scalpel/manager = 120, \
+	/obj/item/weapon/scalpel/laser = 100, \
 	/obj/item/weapon/cautery = 100,			\
 	/obj/item/clothing/mask/cigarette = 75,	\
 	/obj/item/weapon/lighter = 50,			\
@@ -354,7 +351,7 @@
 	name = "remove embedded objects"
 	time = 32
 	allowed_tools = list(
-	/obj/item/weapon/scalpel/manager = 120, \
+	/obj/item/weapon/scalpel/laser/manager = 100, \
 	/obj/item/weapon/hemostat = 100,	\
 	/obj/item/stack/cable_coil = 75, 	\
 	/obj/item/device/assembly/mousetrap = 20

code/modules/surgery/organs/organ.dm

@@ -66,7 +66,7 @@ var/list/organ_cache = list()
 			blood_DNA = list()
 		blood_DNA[dna.unique_enzymes] = dna.b_type
 
-/obj/item/organ/proc/die()
+/obj/item/organ/proc/necrotize(update_sprite=TRUE)
 	if(status & ORGAN_ROBOT)
 		return
 	damage = max_damage
@@ -105,10 +105,10 @@ var/list/organ_cache = list()
 		if(germ_level >= INFECTION_LEVEL_TWO)
 			germ_level += rand(2,6)
 		if(germ_level >= INFECTION_LEVEL_THREE)
-			die()
+			necrotize()
 
 		if(damage >= max_damage)
-			die()
+			necrotize()
 
 	else if(owner.bodytemperature >= 170)	//cryo stops germs from moving and doing their bad stuffs
 		//** Handle antibiotics and curing infections
@@ -117,7 +117,7 @@ var/list/organ_cache = list()
 
 	//check if we've hit max_damage
 	if(damage >= max_damage)
-		die()
+		necrotize()
 
 /obj/item/organ/proc/is_preserved()
 	if(istype(loc,/obj/item/device/mmi))

code/modules/surgery/organs/organ_external.dm

@@ -68,6 +68,19 @@
 	var/can_stand
 	var/wound_cleanup_timer
 
+/obj/item/organ/external/necrotize(update_sprite=TRUE)
+	if(status & (ORGAN_ROBOT|ORGAN_DEAD))
+		return
+	to_chat(owner, "<span class='notice'>You can't feel your [name] anymore...</span>")
+	status |= ORGAN_DEAD
+	if(dead_icon)
+		icon_state = dead_icon
+	if(owner)
+		owner.update_body(update_sprite)
+		owner.bad_external_organs |= src
+		if(vital)
+			owner.death()
+
 /obj/item/organ/external/Destroy()
 	if(parent && parent.children)
 		parent.children -= src
@@ -541,10 +554,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 					parent.germ_level++
 
 	if(germ_level >= INFECTION_LEVEL_THREE && antibiotics < 30)	//overdosing is necessary to stop severe infections
-		if(!(status & ORGAN_DEAD))
-			status |= ORGAN_DEAD
-			to_chat(owner, "<span class='notice'>You can't feel your [name] anymore...</span>")
-			owner.update_body(1)
+		necrotize()
 
 		germ_level++
 		owner.adjustToxLoss(1)

code/modules/surgery/organs_internal.dm

@@ -69,7 +69,7 @@
 	var/implements_extract = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/kitchen/utensil/fork = 55)
 	var/implements_mend = list(/obj/item/stack/medical/bruise_pack = 20,/obj/item/stack/medical/bruise_pack/advanced = 100,/obj/item/stack/nanopaste = 100)
 	//Finish is just so you can close up after you do other things.
-	var/implements_finsh = list(/obj/item/weapon/scalpel/manager = 120,/obj/item/weapon/retractor = 100 ,/obj/item/weapon/crowbar = 75)
+	var/implements_finsh = list(/obj/item/weapon/scalpel/laser/manager = 100,/obj/item/weapon/retractor = 100 ,/obj/item/weapon/crowbar = 75)
 	var/current_type
 	var/obj/item/organ/internal/I = null
 	var/obj/item/organ/external/affected = null
@@ -368,10 +368,6 @@
 /datum/surgery_step/cut_carapace
 	name = "cut carapace"
 	allowed_tools = list(
-	/obj/item/weapon/scalpel/laser3 = 115, \
-	/obj/item/weapon/scalpel/laser2 = 110, \
-	/obj/item/weapon/scalpel/laser1 = 105, \
-	/obj/item/weapon/scalpel/manager = 120, \
 	/obj/item/weapon/scalpel = 100,		\
 	/obj/item/weapon/kitchen/knife = 75,	\
 	/obj/item/weapon/shard = 50, 		\
@@ -406,7 +402,7 @@
 	name = "retract carapace"
 
 	allowed_tools = list(
-	/obj/item/weapon/scalpel/manager = 120, \
+	/obj/item/weapon/scalpel/laser/manager = 100, \
 	/obj/item/weapon/retractor = 100, 	\
 	/obj/item/weapon/crowbar = 75,	\
 	/obj/item/weapon/kitchen/utensil/fork = 50

code/modules/surgery/surgery.dm

@@ -99,18 +99,23 @@
 		return
 	surgery.step_in_progress = 1
 
+	var/speed_mod = 1
+
 	if(begin_step(user, target, target_zone, tool, surgery) == -1)
 		surgery.step_in_progress = 0
 		return
 
-	var/advance = 0
-	var/prob_chance = 100
+	if(tool)
+		speed_mod = tool.toolspeed
+
+	if(do_after(user, time * speed_mod, target = target))
+		var/advance = 0
+		var/prob_chance = 100
+
+		if(implement_type)	//this means it isn't a require nd or any item step.
+			prob_chance = allowed_tools[implement_type]
+		prob_chance *= get_location_modifier(target)
 
-	if(implement_type)	//this means it isn't a require nd or any item step.
-		prob_chance = min(allowed_tools[implement_type], 100)
-	prob_chance *= get_location_modifier(target)
-	
-	if(do_after(user, time * tool.toolspeed, target = target))
 		if(prob(prob_chance) || isrobot(user))
 			if(end_step(user, target, target_zone, tool, surgery))
 				advance = 1

code/modules/surgery/tools.dm

@@ -59,6 +59,7 @@
 	desc = "Cut, cut, and once more cut."
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "scalpel"
+	item_state = "scalpel"
 	flags = CONDUCT
 	force = 10.0
 	sharp = 1
@@ -82,40 +83,35 @@
 /*
  * Researchable Scalpels
  */
-/obj/item/weapon/scalpel/laser1 //lasers also count as catuarys
+/obj/item/weapon/scalpel/laser //parent type
+	name = "laser scalpel"
+	desc = "A scalpel augmented with a directed laser."
+	icon_state = "scalpel_laser1_on"
+	damtype = "fire"
+	hitsound = 'sound/weapons/sear.ogg'
+
+/obj/item/weapon/scalpel/laser/laser1 //lasers also count as catuarys
 	name = "laser scalpel"
 	desc = "A scalpel augmented with a directed laser.  This one looks basic and could be improved."
 	icon_state = "scalpel_laser1_on"
-	item_state = "scalpel"
-	damtype = "fire"
-	hitsound = 'sound/weapons/sear.ogg'
 	toolspeed = 0.8
 
-/obj/item/weapon/scalpel/laser2
+/obj/item/weapon/scalpel/laser/laser2
 	name = "laser scalpel"
 	desc = "A scalpel augmented with a directed laser. This one looks somewhat advanced."
 	icon_state = "scalpel_laser2_on"
-	item_state = "scalpel"
-	damtype = "fire"
-	hitsound = 'sound/weapons/sear.ogg'
 	toolspeed = 0.6
 
-/obj/item/weapon/scalpel/laser3
+/obj/item/weapon/scalpel/laser/laser3
 	name = "laser scalpel"
 	desc = "A scalpel augmented with a directed laser.  This one looks to be the pinnacle of precision energy cutlery!"
 	icon_state = "scalpel_laser3_on"
-	item_state = "scalpel"
-	damtype = "fire"
-	hitsound = 'sound/weapons/sear.ogg'
 	toolspeed = 0.4
 
-/obj/item/weapon/scalpel/manager //super tool! Retractor/hemostat
+/obj/item/weapon/scalpel/laser/manager //super tool! Retractor/hemostat
 	name = "incision management system"
 	desc = "A true extension of the surgeon's body, this marvel instantly and completely prepares an incision allowing for the immediate commencement of therapeutic steps."
 	icon_state = "scalpel_manager_on"
-	item_state = "scalpel"
-	damtype = "fire"
-	hitsound = 'sound/weapons/sear.ogg'
 	toolspeed = 0.2
 
 /obj/item/weapon/circular_saw