Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813

code/modules/admin/topic.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm	(rejected hunks)
-@@ -8,7 +8,7 @@
- 	if(href_list["ahelp"])
- 		if(!check_rights(R_ADMIN))
- 			return
--		
-+
- 		var/ahelp_ref = href_list["ahelp"]
- 		var/datum/admin_help/AH = locate(ahelp_ref)
- 		if(AH)

code/modules/admin/verbs/deadsay.dm

@@ -19,7 +19,7 @@
 
 	if (!msg)
 		return
-	var/nicknames = world.file2list("config/admin_nicknames.txt")
+	var/static/nicknames = world.file2list("config/admin_nicknames.txt")
 
 	var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.holder.fakekey ? pick(nicknames) : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>"
 

code/modules/admin/verbs/playsound.dm

@@ -21,7 +21,7 @@
 	var/res = alert(usr, "Show the title of this song to the players?",, "No", "Yes", "Cancel")
 	switch(res)
 		if("Yes")
-			to_chat(world, "An admin played: [S]")
+			to_chat(world, "<span class='boldannounce'>An admin played: [S]</span>")
 		if("Cancel")
 			return
 

code/modules/admin/verbs/randomverbs.dm

@@ -350,7 +350,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
 
 	if(G_found.mind && !G_found.mind.active)
 		G_found.mind.transfer_to(new_character)	//be careful when doing stuff like this! I've already checked the mind isn't in use
-		new_character.mind.special_verbs = list()
 	else
 		new_character.mind_initialize()
 	if(!new_character.mind.assigned_role)

code/modules/awaymissions/gateway.dm

@@ -227,7 +227,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 			if(check_exile_implant(C))
 				say("Rejecting [AM]: Exile implant detected in contained lifeform.")
 				return
-	if(AM.buckled_mobs.len)
+	if(AM.has_buckled_mobs())
 		for(var/mob/living/carbon/C in AM.buckled_mobs)
 			if(check_exile_implant(C))
 				say("Rejecting [AM]: Exile implant detected in close proximity lifeform.")

code/modules/cargo/exports/materials.dm

@@ -50,11 +50,6 @@
 	material_id = MAT_PLASMA
 	message = "cm3 of plasma"
 
-/datum/export/material/plasma/get_cost(obj/O, contr = 0, emag = 0)
-	. = ..()
-	if(emag) // Syndicate pays you more for the plasma.
-		. = round(. * 1.5)
-
 // Uranium. Still useful for both power generation and nuclear annihilation.
 /datum/export/material/uranium
 	cost = 400
@@ -98,4 +93,4 @@
 	message = "cm3 of glass"
 	material_id = MAT_GLASS
 	export_types = list(/obj/item/stack/sheet/glass, /obj/item/weapon/ore,
-		/obj/item/weapon/shard)
+		/obj/item/weapon/shard)

code/modules/cargo/packs.dm

@@ -182,14 +182,14 @@
 /datum/supply_pack/emergency/syndicate
 	name = "NULL_ENTRY"
 	hidden = TRUE
-	cost = 14000
+	cost = 20000
 	contains = list()
 	crate_name = "emergency crate"
 	crate_type = /obj/structure/closet/crate/internals
 	dangerous = TRUE
 
 /datum/supply_pack/emergency/syndicate/fill(obj/structure/closet/crate/C)
-	var/crate_value = 50
+	var/crate_value = 30
 	var/list/uplink_items = get_uplink_items(SSticker.mode)
 	while(crate_value)
 		var/category = pick(uplink_items)
@@ -828,6 +828,14 @@
 					/obj/item/weapon/defibrillator/loaded)
 	crate_name = "defibrillator crate"
 
+/datum/supply_pack/medical/vending
+	name = "Medical Vending Crate"
+	cost = 2000
+	contains = list(/obj/item/weapon/vending_refill/medical,
+					/obj/item/weapon/vending_refill/medical,
+					/obj/item/weapon/vending_refill/medical)
+	crate_name = "medical vending crate"
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Science /////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////

code/modules/client/verbs/suicide.dm

@@ -13,8 +13,8 @@
 		return
 	if(confirm == "Yes")
 		suiciding = 1
-		log_game("[key_name(src)] (job: [job ? "[job]" : "None"]) commited suicide at [get_area(src)].")
-		message_admins("[key_name(src)] (job: [job ? "[job]" : "None"]) commited suicide at [get_area(src)].")
+		log_game("[key_name(src)] (job: [job ? "[job]" : "None"]) committed suicide at [get_area(src)].")
+		message_admins("[key_name(src)] (job: [job ? "[job]" : "None"]) committed suicide at [get_area(src)].")
 		var/obj/item/held_item = get_active_held_item()
 		if(held_item)
 			var/damagetype = held_item.suicide_act(src)

code/modules/clothing/spacesuits/flightsuit.dm

@@ -326,9 +326,6 @@
 			disable_flight(1)
 		if(!suit)
 			disable_flight(1)
-		if(!resync)
-			addtimer(CALLBACK(src, .proc/resync), 600)
-			resync = 1
 		if(!wearer)	//Oh god our user fell off!
 			disable_flight(1)
 	if(!pressure && brake)
@@ -340,12 +337,6 @@
 			stabilizer = FALSE
 			usermessage("Warning: Sensor data is not being recieved from flight shoes. Stabilizers and airbrake modules OFFLINE!", 2)
 
-//Resync the suit
-/obj/item/device/flightpack/proc/resync()
-	resync = FALSE
-	suit.resync()
-
-//How fast should the wearer be?
 /obj/item/device/flightpack/proc/update_slowdown()
 	if(!flight)
 		suit.slowdown = slowdown_ground
@@ -356,20 +347,11 @@
 /obj/item/device/flightpack/process()
 	if(!suit || (processing_mode == FLIGHTSUIT_PROCESSING_NONE))
 		return FALSE
-	update_slowdown()
-	update_icon()
 	check_conditions()
 	calculate_momentum_speed()
 	momentum_drift()
 	handle_boost()
 	handle_damage()
-	handle_flight()
-
-/obj/item/device/flightpack/proc/handle_flight()
-	if(!flight)
-		return FALSE
-	if(wearer)
-		wearer.float(TRUE)
 
 /obj/item/device/flightpack/proc/handle_damage()
 	if(crash_damage)
@@ -424,7 +406,6 @@
 	if(boost_charge < boost_maxcharge)
 		boost_charge = Clamp(boost_charge+boost_chargerate, 0, boost_maxcharge)
 
-
 /obj/item/device/flightpack/proc/cycle_power()
 	if(powersetting < powersetting_high)
 		powersetting++
@@ -654,6 +635,8 @@
 	wearer.movement_type |= FLYING
 	wearer.pass_flags |= flight_passflags
 	usermessage("ENGAGING FLIGHT ENGINES.")
+	update_slowdown()
+	wearer.floating = TRUE
 	wearer.visible_message("<font color='blue' size='2'>[wearer]'s flight engines activate as they lift into the air!</font>")
 	//I DONT HAVE SOUND EFFECTS YET playsound(
 	flight = TRUE
@@ -670,6 +653,8 @@
 		momentum_x = 0
 		momentum_y = 0
 		usermessage("DISENGAGING FLIGHT ENGINES.")
+		update_slowdown()
+		wearer.floating = FALSE
 		wearer.visible_message("<font color='blue' size='2'>[wearer] drops to the ground as their flight engines cut out!</font>")
 		//NO SOUND YET	playsound(
 		ion_trail.stop()
@@ -678,6 +663,9 @@
 		flight = FALSE
 		if(suit.shoes)
 			suit.shoes.toggle(FALSE)
+		if(isturf(wearer.loc))
+			var/turf/T = wearer.loc
+			T.Entered(src)
 	else
 		if(override_safe)
 			disable_flight(TRUE)
@@ -749,11 +737,13 @@
 	wearer.visible_message("<span class='notice'>[wearer.name]'s flightpack engines flare in intensity as they are rocketed forward by the immense thrust!</span>")
 	boost = TRUE
 	update_slowdown()
+	update_icon()
 
 /obj/item/device/flightpack/proc/deactivate_booster()
 	usermessage("Boosters disengaged!")
 	boost = FALSE
 	update_slowdown()
+	update_icon()
 
 /obj/item/device/flightpack/proc/enable_airbrake()
 	if(wearer)

code/modules/detectivework/scanner.dm

@@ -13,6 +13,8 @@
 	var/scanning = 0
 	var/list/log = list()
 	origin_tech = "engineering=4;biotech=2;programming=5"
+	var/range = 8
+	var/view_check = TRUE
 
 /obj/item/device/detective_scanner/attack_self(mob/user)
 	if(log.len && !scanning)
@@ -43,7 +45,7 @@
 	log = list()
 	scanning = 0
 
-/obj/item/device/detective_scanner/pre_attackby(atom/A, mob/user, params)
+/obj/item/device/detective_scanner/afterattack(atom/A, mob/user, params)
 	scan(A, user)
 	return FALSE
 
@@ -51,9 +53,7 @@
 	set waitfor = 0
 	if(!scanning)
 		// Can remotely scan objects and mobs.
-		if(!in_range(A, user) && !(A in view(world.view, user)))
-			return
-		if(loc != user)
+		if((get_dist(A, user) > range) || (!(A in view(range, user)) && view_check) || (loc != user))
 			return
 
 		scanning = 1

code/modules/food_and_drinks/food/snacks_pastry.dm

@@ -13,8 +13,8 @@
 	filling_color = "#D2691E"
 	tastes = list("donut" = 1)
 
-/obj/item/weapon/reagent_containers/food/snacks/donut/New()
-	..()
+/obj/item/weapon/reagent_containers/food/snacks/donut/Initialize()
+	. = ..()
 	if(prob(30))
 		icon_state = "donut2"
 		name = "frosted donut"
@@ -28,8 +28,8 @@
 	bitesize = 10
 	tastes = list("donut" = 3, "chaos" = 1)
 
-/obj/item/weapon/reagent_containers/food/snacks/donut/chaos/New()
-	..()
+/obj/item/weapon/reagent_containers/food/snacks/donut/chaos/Initialize()
+	. = ..()
 	extra_reagent = pick("nutriment", "capsaicin", "frostoil", "krokodil", "plasma", "cocoa", "slimejelly", "banana", "berryjuice", "omnizine")
 	reagents.add_reagent("[extra_reagent]", 3)
 	bonus_reagents = list("[extra_reagent]" = 3, "sugar" = 1)
@@ -48,8 +48,8 @@
 	extra_reagent = "berryjuice"
 	tastes = list("jelly" = 1, "donut" = 3)
 
-/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/New()
-	..()
+/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/Initialize()
+	. = ..()
 	if(extra_reagent)
 		reagents.add_reagent("[extra_reagent]", 3)
 	if(prob(30))
@@ -210,13 +210,13 @@
 	filling_color = "#F0E68C"
 	tastes = list("mushroom" = 1, "biscuit" = 1)
 
-/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/New()
+/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize()
 	var/fey = prob(10)
 	if(fey)
 		name = "exceptional plump helmet biscuit"
 		desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
 		bonus_reagents = list("omnizine" = 5, "nutriment" = 1, "vitamin" = 1)
-	..()
+	. = ..()
 	if(fey)
 		reagents.add_reagent("omnizine", 5)
 

code/modules/food_and_drinks/food/snacks_soup.dm

@@ -128,6 +128,13 @@
 	list_reagents = list("nutriment" = 5, "tomatojuice" = 10, "vitamin" = 3)
 	tastes = list("tomato" = 1)
 
+/obj/item/weapon/reagent_containers/food/snacks/soup/tomato/eyeball
+	name = "eyeball soup"
+	desc = "It looks back at you..."
+	icon_state = "eyeballsoup"
+	bonus_reagents = list("nutriment" = 1, "liquidgibs" = 3)
+	tastes = list("tomato" = 1, "squirming" = 1)
+
 /obj/item/weapon/reagent_containers/food/snacks/soup/milo
 	name = "milosoup"
 	desc = "The universes best soup! Yum!!!"
@@ -196,5 +203,3 @@
 	icon_state = "redbeetsoup"
 	bonus_reagents = list("nutriment" = 4, "vitamin" = 6)
 	tastes = list("beet" = 1)
-
-

code/modules/food_and_drinks/food/snacks_spaghetti.dm

@@ -83,5 +83,5 @@
 	icon = 'icons/obj/food/pizzaspaghetti.dmi'
 	icon_state = "beefnoodle"
 	trash = /obj/item/weapon/reagent_containers/glass/bowl
-	bonus_reagents = list("nutriment" = 5, "vitamin" = 6)
+	bonus_reagents = list("nutriment" = 5, "vitamin" = 6, "liquidgibs" = 3)
 	tastes = list("noodle" = 1, "meat" = 1)

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

@@ -91,6 +91,18 @@
 	result = /obj/item/weapon/reagent_containers/food/snacks/soup/tomato
 	category = CAT_SOUP
 
+/datum/crafting_recipe/food/eyeballsoup
+	name = "Eyeball soup"
+	reqs = list(
+		/datum/reagent/water = 10,
+		/obj/item/weapon/reagent_containers/glass/bowl = 1,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 2,
+		/obj/item/organ/eyes = 1
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/soup/tomato/eyeball
+	category = CAT_SOUP
+
+
 /datum/crafting_recipe/food/milosoup
 	name = "Milo soup"
 	reqs = list(

code/modules/hydroponics/grown.dm

@@ -111,6 +111,7 @@
 		for(var/datum/plant_gene/trait/trait in seed.genes)
 			trait.on_squash(src, target)
 
+	reagents.reaction(T)
 	for(var/A in T)
 		reagents.reaction(A)
 

code/modules/mining/machine_redemption.dm

@@ -84,7 +84,7 @@
 	if(D.make_reagents.len)
 		return 0
 
-	var/build_amount = 1
+	var/build_amount = 0
 
 	for(var/mat_id in D.materials)
 		var/M = D.materials[mat_id]
@@ -93,7 +93,15 @@
 		if(!M || !redemption_mat)
 			return 0
 
-		build_amount = min(build_amount, round(redemption_mat.amount / M))
+		var/smeltable_sheets = round(redemption_mat.amount / M)
+
+		if(!smeltable_sheets)
+			return 0
+
+		if(!build_amount)
+			build_amount = smeltable_sheets
+
+		build_amount = min(build_amount, smeltable_sheets)
 
 	return build_amount
 
@@ -152,6 +160,7 @@
 	if(exchange_parts(user, W))
 		return
 	if(default_pry_open(W))
+		materials.retrieve_all()
 		return
 	if(default_unfasten_wrench(user, W))
 		return

code/modules/mob/living/blood.dm

@@ -35,22 +35,21 @@
 			blood_volume += 0.1 // regenerate blood VERY slowly
 
 		//Effects of bloodloss
+		var/word = pick("dizzy","woozy","faint")
 		switch(blood_volume)
 			if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
 				if(prob(5))
-					to_chat(src, "<span class='warning'>You feel [pick("dizzy","woozy","faint")].</span>")
+					to_chat(src, "<span class='warning'>You feel [word].</span>")
 				adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.01, 1))
 			if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY)
 				adjustOxyLoss(round((BLOOD_VOLUME_NORMAL - blood_volume) * 0.02, 1))
 				if(prob(5))
 					blur_eyes(6)
-					var/word = pick("dizzy","woozy","faint")
 					to_chat(src, "<span class='warning'>You feel very [word].</span>")
 			if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD)
 				adjustOxyLoss(5)
 				if(prob(15))
 					Paralyse(rand(1,3))
-					var/word = pick("dizzy","woozy","faint")
 					to_chat(src, "<span class='warning'>You feel extremely [word].</span>")
 			if(0 to BLOOD_VOLUME_SURVIVE)
 				death()
@@ -70,7 +69,7 @@
 
 		bleed_rate = max(bleed_rate - 0.5, temp_bleed)//if no wounds, other bleed effects (heparin) naturally decreases
 
-		if(bleed_rate && !bleedsuppress)
+		if(bleed_rate && !bleedsuppress && !(status_flags & FAKEDEATH))
 			bleed(bleed_rate)
 
 //Makes a blood drop, leaking amt units of blood from the mob

code/modules/mob/living/carbon/alien/organs.dm

@@ -87,6 +87,8 @@
 			owner.adjustFireLoss(-heal_amt)
 			owner.adjustOxyLoss(-heal_amt)
 			owner.adjustCloneLoss(-heal_amt)
+	else
+		owner.adjustPlasma(plasma_rate * 0.1)
 
 /obj/item/organ/alien/plasmavessel/Insert(mob/living/carbon/M, special = 0)
 	..()

code/modules/mob/living/carbon/alien/say.dm

@@ -1,4 +1,4 @@
-/mob/living/proc/alien_talk(message, shown_name = name)
+/mob/living/proc/alien_talk(message, shown_name = real_name)
 	log_say("[key_name(src)] : [message]")
 	message = trim(message)
 	if(!message) return

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

@@ -484,7 +484,7 @@
 				adjustBruteLoss(3)
 		else
 			if(T)
-				T.add_vomit_floor(src, 0)//toxic barf looks different
+				T.add_vomit_floor(src, toxic)//toxic barf looks different
 			nutrition -= lost_nutrition
 			adjustToxLoss(-3)
 		T = get_step(T, dir)
@@ -492,6 +492,16 @@
 			break
 	return 1
 
+/mob/living/carbon/proc/spew_organ(power = 5)
+	if(!internal_organs.len)
+		return //Guess we're out of organs
+	var/obj/item/organ/guts = pick(internal_organs)
+	var/turf/T = get_turf(src)
+	guts.Remove(src)
+	guts.forceMove(T)
+	var/atom/throw_target = get_edge_target_turf(guts, dir)
+	guts.throw_at(throw_target, power, 4, src)
+
 
 /mob/living/carbon/fully_replace_character_name(oldname,newname)
 	..()

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

@@ -68,6 +68,17 @@
 	if(!isnum(text2num(params)))
 		return message
 
+/datum/emote/sound/carbon/snap
+	key = "snap"
+	key_third_person = "snaps"
+	message = "snaps their fingers."
+	muzzle_ignore = TRUE
+	restraint_check = TRUE
+	emote_type = EMOTE_AUDIBLE
+	sound = 'sound/effects/snap01.ogg'
+	mob_type_allowed_typecache = list(/mob/living/carbon/)
+
+
 /datum/emote/living/carbon/sign/signal
 	key = "signal"
 	key_third_person = "signals"

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

@@ -1,10 +0,0 @@
-diff a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm	(rejected hunks)
-@@ -32,7 +32,7 @@
- 
- 	dna.species.spec_death(gibbed, src)
- 
--	if(SSticker && SSticker.mode)
-+	if(SSticker.HasRoundStarted())
- 		SSblackbox.ReportDeath(src)
- 	if(mind && mind.devilinfo)
- 		INVOKE_ASYNC(mind.devilinfo, /datum/devilinfo.proc/beginResurrectionCheck, src)

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

@@ -171,5 +171,8 @@
 		dna.species.mutant_bodyparts -= "wingsopen"
 		dna.species.mutant_bodyparts |= "wings"
 	update_body()
+	if(isturf(loc))
+		var/turf/T = loc
+		T.Entered(src)
 
 //Ayy lmao

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

@@ -134,7 +134,7 @@
 	if(stat == DEAD || (status_flags & FAKEDEATH))
 		appears_dead = 1
 		if(suiciding)
-			msg += "<span class='warning'>[t_He] appear[p_s()] to have commited suicide... there is no hope of recovery.</span>\n"
+			msg += "<span class='warning'>[t_He] appear[p_s()] to have committed suicide... there is no hope of recovery.</span>\n"
 		if(hellbound)
 			msg += "<span class='warning'>[t_His] soul seems to have been ripped out of [t_his] body.  Revival is impossible.</span>\n"
 		msg += "<span class='deadsay'>[t_He] [t_is] limp and unresponsive; there are no signs of life"

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

@@ -119,6 +119,8 @@
 		var/obj/item/thing = C.get_item_by_slot(slot_id)
 		if(thing && (!thing.species_exception || !is_type_in_list(src,thing.species_exception)))
 			C.dropItemToGround(thing)
+	if(C.hud_used)
+		C.hud_used.update_locked_slots()
 
 	// this needs to be FIRST because qdel calls update_body which checks if we have DIGITIGRADE legs or not and if not then removes DIGITIGRADE from species_traits
 	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Digitigrade Legs")

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

@@ -9,7 +9,7 @@
 	punchdamagelow = 5
 	punchdamagehigh = 14
 	punchstunthreshold = 11 //about 40% chance to stun
-	no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform)
+	no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_w_uniform, slot_s_store)
 	nojumpsuit = 1
 	sexes = 1
 	damage_overlay_type = ""

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

@@ -28,7 +28,7 @@
 		//Holopad
 		if(istype(ai.current, /obj/machinery/holopad))
 			var/obj/machinery/holopad/H = ai.current
-			H.move_hologram(ai)
+			H.move_hologram(ai, T)
 
 /mob/camera/aiEye/Move()
 	return 0

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

@@ -0,0 +1,85 @@
+/mob/living/simple_animal/hostile/jungle
+	vision_range = 5
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	faction = list("jungle")
+	weather_immunities = list("acid")
+	obj_damage = 30
+	environment_smash = 2
+	minbodytemp = 0
+	maxbodytemp = 450
+	response_help = "pokes"
+	response_disarm = "shoves"
+	response_harm = "strikes"
+	status_flags = 0
+	a_intent = INTENT_HARM
+	see_in_dark = 4
+	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
+	mob_size = MOB_SIZE_LARGE
+
+
+
+//Mega arachnid
+
+/mob/living/simple_animal/hostile/jungle/mega_arachnid
+	name = "mega arachnid"
+	desc = "Though physically imposing, it prefers to ambush its prey, and it will only engage with an already crippled opponent."
+	melee_damage_lower = 30
+	melee_damage_upper = 30
+	maxHealth = 300
+	health = 300
+	speed = 1
+	ranged = 1
+	pixel_x = -16
+	move_to_delay = 10
+	aggro_vision_range = 9
+	speak_emote = list("chitters")
+	attack_sound = 'sound/weapons/bladeslice.ogg'
+	ranged_cooldown_time = 60
+	projectiletype = /obj/item/projectile/mega_arachnid
+	projectilesound = 'sound/weapons/pierce.ogg'
+	icon = 'icons/mob/jungle/arachnid.dmi'
+	icon_state = "arachnid"
+	icon_living = "arachnid"
+	icon_dead = "dead_purple"
+	alpha = 50
+
+/mob/living/simple_animal/hostile/jungle/mega_arachnid/Life()
+	..()
+	if(target && ranged_cooldown > world.time && iscarbon(target))
+		var/mob/living/carbon/C = target
+		if(!C.legcuffed && C.health < 50)
+			retreat_distance = 9
+			minimum_distance = 9
+			alpha = 125
+			return
+	retreat_distance = 0
+	minimum_distance = 0
+	alpha = 255
+
+
+/mob/living/simple_animal/hostile/jungle/mega_arachnid/Aggro()
+	..()
+	alpha = 255
+
+/mob/living/simple_animal/hostile/jungle/mega_arachnid/LoseAggro()
+	..()
+	alpha = 50
+
+/obj/item/projectile/mega_arachnid
+	name = "flesh snare"
+	nodamage = 1
+	damage = 0
+	icon_state = "tentacle_end"
+
+/obj/item/projectile/mega_arachnid/on_hit(atom/target, blocked = 0)
+	if(iscarbon(target) && blocked < 100)
+		var/obj/item/weapon/restraints/legcuffs/beartrap/mega_arachnid/B = new /obj/item/weapon/restraints/legcuffs/beartrap/mega_arachnid(get_turf(target))
+		B.Crossed(target)
+	..()
+
+/obj/item/weapon/restraints/legcuffs/beartrap/mega_arachnid
+	name = "fleshy restraints"
+	desc = "Used by mega arachnids to immobilize their prey."
+	flags = DROPDEL
+	icon_state = "tentacle_end"
+	icon = 'icons/obj/projectiles.dmi'

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

@@ -16,7 +16,7 @@
 	response_disarm = "shoos"
 	response_harm   = "stomps on"
 	emote_see = list("jiggles", "bounces in place")
-	speak_emote = list("telepathically chirps")
+	speak_emote = list("blorbles")
 	bubble_icon = "slime"
 	initial_languages = list(/datum/language/common, /datum/language/slime)
 
@@ -31,10 +31,10 @@
 
 	see_in_dark = 8
 
-	verb_say = "telepathically chirps"
-	verb_ask = "telepathically asks"
-	verb_exclaim = "telepathically cries"
-	verb_yell = "telephatically cries"
+	verb_say = "blorbles"
+	verb_ask = "inquisitively blorbles"
+	verb_exclaim = "loudly blorbles"
+	verb_yell = "loudly blorbles"
 
 	// canstun and canweaken don't affect slimes because they ignore stun and weakened variables
 	// for the sake of cleanliness, though, here they are.

code/modules/mob/mob.dm

@@ -351,6 +351,8 @@
 /mob/proc/spin(spintime, speed)
 	set waitfor = 0
 	var/D = dir
+	if((spintime < 1)||(speed < 1)||!spintime||!speed)
+		return
 	while(spintime >= speed)
 		sleep(speed)
 		switch(D)

code/modules/power/generator.dm

@@ -28,11 +28,12 @@
 
 
 /obj/machinery/power/generator/Initialize(mapload)
-	. = ..()
+	. = ..()
 	var/obj/machinery/atmospherics/components/binary/circulator/circpath = /obj/machinery/atmospherics/components/binary/circulator
 	cold_circ = locate(circpath) in get_step(src, cold_dir)
 	hot_circ = locate(circpath) in get_step(src, hot_dir)
 	connect_to_network()
+	SSair.atmos_machinery += src
 
 	if(cold_circ)
 		switch(cold_dir)
@@ -55,6 +56,9 @@
 
 	update_icon()
 
+/obj/machinery/power/generator/Destroy()
+	SSair.atmos_machinery -= src
+	return ..()
 
 /obj/machinery/power/generator/update_icon()
 
@@ -63,21 +67,20 @@
 	else
 		cut_overlays()
 
-		if(lastgenlev != 0)
-			add_overlay("teg-op[lastgenlev]")
+		var/L = min(round(lastgenlev/100000),11)
+		if(L != 0)
+			add_overlay(image('icons/obj/power.dmi', "teg-op[L]"))
 
-		add_overlay("teg-oc[lastcirc]")
+		add_overlay("teg-oc[lastcirc]")
 
 
 #define GENRATE 800		// generator output coefficient from Q
 
-/obj/machinery/power/generator/process()
+/obj/machinery/power/generator/process_atmos()
 
 	if(!cold_circ || !hot_circ)
 		return
 
-	lastgen = 0
-
 	if(powernet)
 		//to_chat(world, "cold_circ and hot_circ pass")
 
@@ -104,7 +107,7 @@
 				var/energy_transfer = delta_temperature*hot_air_heat_capacity*cold_air_heat_capacity/(hot_air_heat_capacity+cold_air_heat_capacity)
 
 				var/heat = energy_transfer*(1-efficiency)
-				lastgen = energy_transfer*efficiency
+				lastgen += energy_transfer*efficiency
 
 				//to_chat(world, "lastgen = [lastgen]; heat = [heat]; delta_temperature = [delta_temperature]; hot_air_heat_capacity = [hot_air_heat_capacity]; cold_air_heat_capacity = [cold_air_heat_capacity];")
 
@@ -113,7 +116,7 @@
 
 				//to_chat(world, "POWER: [lastgen] W generated at [efficiency*100]% efficiency and sinks sizes [cold_air_heat_capacity], [hot_air_heat_capacity]")
 
-				add_avail(lastgen)
+				//add_avail(lastgen) This is done in process now
 		// update icon overlays only if displayed level has changed
 
 		if(hot_air)
@@ -124,15 +127,23 @@
 			var/datum/gas_mixture/cold_circ_air1 = cold_circ.AIR1
 			cold_circ_air1.merge(cold_air)
 
-	var/genlev = max(0, min( round(11*lastgen / 100000), 11))
+		update_icon()
+
 	var/circ = "[cold_circ && cold_circ.last_pressure_delta > 0 ? "1" : "0"][hot_circ && hot_circ.last_pressure_delta > 0 ? "1" : "0"]"
-	if((genlev != lastgenlev) || (circ != lastcirc))
-		lastgenlev = genlev
+	if(circ != lastcirc)
 		lastcirc = circ
 		update_icon()
 
 	src.updateDialog()
 
+/obj/machinery/power/generator/process()
+	//Setting this number higher just makes the change in power output slower, it doesnt actualy reduce power output cause **math**
+	var/power_output = round(lastgen / 10)
+	add_avail(power_output)
+	lastgenlev = power_output
+	lastgen -= power_output
+	..()
+
 /obj/machinery/power/generator/attack_hand(mob/user)
 	if(..())
 		user << browse(null, "window=teg")
@@ -151,7 +162,13 @@
 
 		t += "<div class='statusDisplay'>"
 
-		t += "Output: [round(lastgen)] W"
+		var/displaygen = lastgenlev
+		if(displaygen < 1000000) //less than a MW
+			displaygen /= 1000
+			t += "Output: [round(displaygen,0.01)] kW"
+		else
+			displaygen /= 1000000
+			t += "Output: [round(displaygen,0.01)] MW"
 
 		t += "<BR>"
 

code/modules/power/singularity/narsie.dm

@@ -14,6 +14,7 @@
 	light_power = 0.7
 	light_range = 15
 	light_color = rgb(255, 0, 0)
+	gender = FEMALE
 	var/clashing = FALSE //If Nar-Sie is fighting Ratvar
 
 /obj/singularity/narsie/large
@@ -26,8 +27,8 @@
 	grav_pull = 10
 	consume_range = 12 //How many tiles out do we eat
 
-/obj/singularity/narsie/large/New()
-	..()
+/obj/singularity/narsie/large/Initialize()
+	. = ..()
 	send_to_playing_players("<span class='narsie'>NAR-SIE HAS RISEN</span>")
 	send_to_playing_players(pick('sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg'))
 

code/modules/power/singularity/singularity.dm

@@ -29,12 +29,12 @@
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	dangerous_possession = TRUE
 
-/obj/singularity/New(loc, var/starting_energy = 50, var/temp = 0)
+/obj/singularity/Initialize(mapload, starting_energy = 50)
 	//CARN: admin-alert for chuckle-fuckery.
 	admin_investigate_setup()
 
 	src.energy = starting_energy
-	..()
+	. = ..()
 	START_PROCESSING(SSobj, src)
 	GLOB.poi_list |= src
 	GLOB.singularities |= src

code/modules/power/supermatter/supermatter.dm

@@ -129,6 +129,7 @@
 
 /obj/machinery/power/supermatter_shard/Initialize()
 	. = ..()
+	SSair.atmos_machinery += src
 	countdown = new(src)
 	countdown.start()
 	GLOB.poi_list |= src
@@ -139,6 +140,7 @@
 
 /obj/machinery/power/supermatter_shard/Destroy()
 	investigate_log("has been destroyed.", "supermatter")
+	SSair.atmos_machinery -= src
 	QDEL_NULL(radio)
 	GLOB.poi_list -= src
 	QDEL_NULL(countdown)
@@ -181,7 +183,7 @@
 			E.energy = power
 		qdel(src)
 
-/obj/machinery/power/supermatter_shard/process()
+/obj/machinery/power/supermatter_shard/process_atmos()
 	var/turf/T = loc
 
 	if(isnull(T))		// We have a null turf...something is wrong, stop processing this entity.
@@ -296,6 +298,7 @@
 
 	if(produces_gas)
 		env.merge(removed)
+		air_update_turf()
 
 	for(var/mob/living/carbon/human/l in view(src, HALLUCINATION_RANGE(power))) // If they can see it without mesons on.  Bad on them.
 		if(!istype(l.glasses, /obj/item/clothing/glasses/meson))

code/modules/power/tesla/energy_ball.dm

@@ -40,6 +40,11 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
 	var/energy_to_raise = 32
 	var/energy_to_lower = -20
 
+/obj/singularity/energy_ball/Initialize(mapload, starting_energy = 50, is_miniball = FALSE)
+	. = ..()
+	if(!is_miniball)
+		set_light(10, 7, "#EEEEFF")
+
 /obj/singularity/energy_ball/ex_act(severity, target)
 	return
 
@@ -54,6 +59,11 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
 
 	. = ..()
 
+/obj/singularity/energy_ball/admin_investigate_setup()
+	if(istype(loc, /obj/singularity/energy_ball))
+		return
+	..()
+
 /obj/singularity/energy_ball/process()
 	if(!orbiting)
 		handle_energy()
@@ -117,7 +127,7 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
 /obj/singularity/energy_ball/proc/new_mini_ball()
 	if(!loc)
 		return
-	var/obj/singularity/energy_ball/EB = new(loc)
+	var/obj/singularity/energy_ball/EB = new(loc, 0, TRUE)
 
 	EB.transform *= pick(0.3, 0.4, 0.5, 0.6, 0.7)
 	var/icon/I = icon(icon,icon_state,dir)

code/modules/projectiles/ammunition/energy.dm

@@ -191,7 +191,7 @@
 	fire_sound = 'sound/magic/lightningbolt.ogg'
 	e_cost = 200
 	select_name = "stun"
-	projectile_type = /obj/item/projectile/energy/tesla_revolver
+	projectile_type = /obj/item/projectile/energy/tesla/revolver
 
 /obj/item/ammo_casing/energy/gravityrepulse
 	projectile_type = /obj/item/projectile/gravityrepulse

code/modules/projectiles/projectile.dm

@@ -179,6 +179,8 @@
 		return
 	if(setAngle)
 		Angle = setAngle
+	var/old_pixel_x = pixel_x
+	var/old_pixel_y = pixel_y
 	if(!legacy) //new projectiles
 		set waitfor = 0
 		var/next_run = world.time
@@ -201,29 +203,30 @@
 
 			var/Pixel_x=round((sin(Angle)+16*sin(Angle)*2), 1)	//round() is a floor operation when only one argument is supplied, we don't want that here
 			var/Pixel_y=round((cos(Angle)+16*cos(Angle)*2), 1)
-			var/pixel_x_offset = pixel_x + Pixel_x
-			var/pixel_y_offset = pixel_y + Pixel_y
+			var/pixel_x_offset = old_pixel_x + Pixel_x
+			var/pixel_y_offset = old_pixel_y + Pixel_y
 			var/new_x = x
 			var/new_y = y
 
 			while(pixel_x_offset > 16)
 				pixel_x_offset -= 32
-				pixel_x -= 32
+				old_pixel_x -= 32
 				new_x++// x++
 			while(pixel_x_offset < -16)
 				pixel_x_offset += 32
-				pixel_x += 32
+				old_pixel_x += 32
 				new_x--
-
 			while(pixel_y_offset > 16)
 				pixel_y_offset -= 32
-				pixel_y -= 32
+				old_pixel_y -= 32
 				new_y++
 			while(pixel_y_offset < -16)
 				pixel_y_offset += 32
-				pixel_y += 32
+				old_pixel_y += 32
 				new_y--
-
+				
+			pixel_x = old_pixel_x
+			pixel_y = old_pixel_y
 			step_towards(src, locate(new_x, new_y, z))
 			next_run += max(world.tick_lag, speed)
 			var/delay = next_run - world.time
@@ -232,7 +235,9 @@
 				pixel_y = pixel_y_offset
 			else
 				animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)), flags = ANIMATION_END_NOW)
-
+			old_pixel_x = pixel_x_offset
+			old_pixel_y = pixel_y_offset
+			
 			if(original && (original.layer>=2.75) || ismob(original))
 				if(loc == get_turf(original))
 					if(!(original in permutated))

code/modules/projectiles/projectile/energy.dm

@@ -159,44 +159,34 @@
 /obj/item/projectile/energy/bolt/large
 	damage = 20
 
-/obj/item/projectile/energy/tesla_revolver
+/obj/item/projectile/energy/tesla
 	name = "tesla bolt"
 	icon_state = "tesla_projectile"
 	impact_effect_type = /obj/effect/overlay/temp/impact_effect/blue_laser
 	var/chain
 
-/obj/item/projectile/energy/tesla_revolver/fire(setAngle)
+/obj/item/projectile/energy/tesla/fire(setAngle)
 	if(firer)
 		chain = firer.Beam(src, icon_state = "lightning[rand(1, 12)]", time = INFINITY, maxdistance = INFINITY)
 	..()
 
-/obj/item/projectile/energy/tesla_revolver/on_hit(atom/target)
-	. = ..()
-	if(isliving(target))
-		tesla_zap(src, 3, 10000)
-	qdel(src)
-
-/obj/item/projectile/energy/tesla_revolver/Destroy()
+/obj/item/projectile/energy/tesla/Destroy()
 	qdel(chain)
 	return ..()
 
+/obj/item/projectile/energy/tesla/revolver
+	name = "energy orb"
 
-/obj/item/projectile/energy/tesla_cannon
-	name = "tesla bolt"
-	icon_state = "tesla_projectile"
-	impact_effect_type = /obj/effect/overlay/temp/impact_effect/blue_laser
-	var/chain
+/obj/item/projectile/energy/tesla/revolver/on_hit(atom/target)
+	. = ..()
+	if(isliving(target))
+		tesla_zap(target, 3, 10000)
+	qdel(src)
 
-/obj/item/projectile/energy/tesla_cannon/fire(setAngle)
-	if(firer)
-		chain = firer.Beam(src, icon_state = "lightning[rand(1, 12)]", time = INFINITY, maxdistance = INFINITY)
-	..()
+/obj/item/projectile/energy/tesla/cannon
+	name = "tesla orb"
 
-/obj/item/projectile/energy/tesla_cannon/on_hit(atom/target)
+/obj/item/projectile/energy/tesla/cannon/on_hit(atom/target)
 	. = ..()
-	tesla_zap(src, 3, 10000, explosive = FALSE, stun_mobs = FALSE)
+	tesla_zap(target, 3, 10000, explosive = FALSE, stun_mobs = FALSE)
 	qdel(src)
-
-/obj/item/projectile/energy/tesla_cannon/Destroy()
-	qdel(chain)
-	return ..()

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

@@ -38,7 +38,7 @@
 				/obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
 				/obj/item/weapon/reagent_containers/food/snacks/grown/oat = list("flour" = -5),
 				/obj/item/weapon/reagent_containers/food/snacks/grown/rice = list("rice" = -5),
-				/obj/item/weapon/reagent_containers/food/snacks/donut/New = list("sprinkles" = -2, "sugar" = 1),
+				/obj/item/weapon/reagent_containers/food/snacks/donut = list("sprinkles" = -2, "sugar" = 1),
 				/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
 				/obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0),
 				/obj/item/weapon/reagent_containers/food/snacks/egg = list("eggyolk" = -5),

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -966,7 +966,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	glass_desc = "Only for the experienced. You think you see sand floating in the glass."
 
 /datum/reagent/consumable/ethanol/bananahonk
-	name = "Banana Mama"
+	name = "Banana Honk"
 	id = "bananahonk"
 	description = "A drink from Clown Heaven."
 	nutriment_factor = 1 * REAGENTS_METABOLISM

code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -60,7 +60,10 @@
 	// data for nutriment is one or more (flavour -> ratio)
 	// where all the ratio values adds up to 1
 
-	var/list/taste_amounts = data.Copy()
+	var/list/taste_amounts = list()
+	if(data)
+		taste_amounts = data.Copy()
+
 	counterlist_scale(taste_amounts, volume)
 
 	var/list/other_taste_amounts = newdata.Copy()

code/modules/reagents/chemistry/reagents/medicine_reagents.dm

@@ -347,10 +347,9 @@
 /datum/reagent/medicine/mine_salve/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
 	if(iscarbon(M) && M.stat != DEAD)
 		if(method in list(INGEST, VAPOR, INJECT))
-			M.Stun(4)
-			M.Weaken(4)
+			M.nutrition -= 5
 			if(show_message)
-				to_chat(M, "<span class='warning'>Your stomach agonizingly cramps!</span>")
+				to_chat(M, "<span class='warning'>Your stomach feels empty and cramps!</span>")
 		else
 			var/mob/living/carbon/C = M
 			for(var/s in C.surgeries)
@@ -962,8 +961,7 @@
 /datum/reagent/medicine/antitoxin/on_mob_life(mob/living/M)
 	M.adjustToxLoss(-2*REM, 0)
 	for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
-		if(R != src)
-			M.reagents.remove_reagent(R.id,1)
+		M.reagents.remove_reagent(R.id,1)
 	..()
 	. = 1
 

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -189,7 +189,7 @@
 /datum/reagent/water/holywater/on_mob_life(mob/living/M)
 	if(!data) data = 1
 	data++
-	M.jitteriness = max(M.jitteriness-5,0)
+	M.jitteriness = min(M.jitteriness+4,10)
 	if(data >= 30)		// 12 units, 54 seconds @ metabolism 0.4 units & tick rate 1.8 sec
 		if(!M.stuttering)
 			M.stuttering = 1
@@ -212,9 +212,9 @@
 				SSticker.mode.remove_cultist(M.mind, 1, 1)
 			else if(is_servant_of_ratvar(M))
 				remove_servant_of_ratvar(M)
-			holder.remove_reagent(id, volume)	// maybe this is a little too perfect and a max() cap on the statuses would be better??
 			M.jitteriness = 0
 			M.stuttering = 0
+			holder.remove_reagent(id, volume)	// maybe this is a little too perfect and a max() cap on the statuses would be better??
 			return
 	holder.remove_reagent(id, 0.4)	//fixed consumption to prevent balancing going out of whack
 
@@ -658,7 +658,7 @@
 	taste_mult = 0 // apparently tasteless.
 
 /datum/reagent/mercury/on_mob_life(mob/living/M)
-	if(M.canmove && isspaceturf(M.loc))
+	if(M.canmove && !isspaceturf(M.loc))
 		step(M, pick(GLOB.cardinal))
 	if(prob(5))
 		M.emote(pick("twitch","drool","moan"))
@@ -738,7 +738,7 @@
 	taste_description = "metal"
 
 /datum/reagent/lithium/on_mob_life(mob/living/M)
-	if(M.canmove && isspaceturf(M.loc))
+	if(M.canmove && !isspaceturf(M.loc))
 		step(M, pick(GLOB.cardinal))
 	if(prob(5))
 		M.emote(pick("twitch","drool","moan"))
@@ -1568,6 +1568,13 @@
 	M.update_transform()
 	..()
 
+/datum/reagent/plastic_polymers
+	name = "plastic polymers"
+	id = "plastic_polymers"
+	description = "the petroleum based components of plastic."
+	color = "#f7eded"
+	taste_description = "plastic"
+
 /datum/reagent/glitter
 	name = "generic glitter"
 	id = "glitter"

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

@@ -648,6 +648,34 @@
 	M.losebreath += 5
 	return ..()
 
+/datum/reagent/toxin/spewium
+	name = "Spewium"
+	id = "spewium"
+	description = "A powerful emetic, causes uncontrollable vomiting.  May result in vomiting organs at high doses."
+	reagent_state = LIQUID
+	color = "#2f6617" //A sickly green color
+	metabolization_rate = REAGENTS_METABOLISM
+	overdose_threshold = 29
+	toxpwr = 0
+	taste_description = "vomit"
+
+/datum/reagent/toxin/spewium/on_mob_life(mob/living/M)
+	.=..()
+	if(current_cycle >=11 && prob(min(50,current_cycle)) && ishuman(M))
+		var/mob/living/carbon/human/H = M
+		H.vomit(lost_nutrition = 10, blood = prob(10), stun = prob(50), distance = rand(0,4), message = TRUE, toxic = prob(30))
+		for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
+			if(R != src)
+				H.reagents.remove_reagent(R.id,1)
+
+/datum/reagent/toxin/spewium/overdose_process(mob/living/M)
+	. = ..()
+	if(current_cycle >=33 && prob(15) && ishuman(M))
+		var/mob/living/carbon/human/H = M
+		H.spew_organ()
+		H.vomit(lost_nutrition = 0, blood = 1, stun = 1, distance = 4)
+		to_chat(H, "<span class='userdanger'>You feel something lumpy come up as you vomit.</span>")
+
 /datum/reagent/toxin/curare
 	name = "Curare"
 	id = "curare"

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

@@ -624,3 +624,14 @@
 	id = "laughter"
 	results = list("laughter" = 10) // Fuck it. I'm not touching this one.
 	required_reagents = list("sugar" = 1, "banana" = 1)
+
+/datum/chemical_reaction/plastic_polymers
+	name = "plastic polymers"
+	id = "plastic_polymers"
+	required_reagents = list("oil" = 5, "sodiumchloride" = 2, "ash" = 3)
+	required_temp = 374 //lazily consistent with soap & other crafted objects generically created with heat.
+
+/datum/chemical_reaction/plastic_polymers/on_reaction(datum/reagents/holder, created_volume)
+	var/location = get_turf(holder.my_atom)
+	for(var/i in 1 to 10)
+		new /obj/item/stack/sheet/plastic(location)

code/modules/reagents/reagent_containers/bottle.dm

@@ -58,6 +58,12 @@
 	icon_state = "bottle12"
 	list_reagents = list("cyanide" = 30)
 
+/obj/item/weapon/reagent_containers/glass/bottle/spewium
+	name = "spewium bottle"
+	desc = "A small bottle of spewium."
+	icon_state = "bottle12"
+	list_reagents = list("spewium" = 30)
+
 /obj/item/weapon/reagent_containers/glass/bottle/morphine
 	name = "morphine bottle"
 	desc = "A small bottle of morphine."

code/modules/shuttle/elevator.dm

@@ -0,0 +1,10 @@
+/obj/docking_port/mobile/elevator
+	name = "elevator"
+	id = "elevator"
+	dwidth = 3
+	width = 7
+	height = 7
+	knockdown = FALSE
+
+/obj/docking_port/mobile/elevator/request(obj/docking_port/stationary/S) //No transit, no ignition, just a simple up/down platform
+	dock(S, TRUE)

code/modules/shuttle/on_move.dm

@@ -3,7 +3,7 @@
 	return
 
 // Called when shuttle attempts to move an atom.
-/atom/movable/proc/onShuttleMove(turf/T1, rotation)
+/atom/movable/proc/onShuttleMove(turf/T1, rotation, knockdown = TRUE)
 	if(rotation)
 		shuttleRotate(rotation)
 	loc = T1
@@ -47,11 +47,11 @@
 		else
 			shake_camera(src, 7, 1)
 
-/mob/living/carbon/onShuttleMove()
+/mob/living/carbon/onShuttleMove(turf/T1, rotation, knockdown = TRUE)
 	. = ..()
 	if(!.)
 		return
-	if(!buckled)
+	if(!buckled && knockdown)
 		Weaken(3)
 
 /obj/effect/abstract/proximity_checker/onShuttleMove()

code/modules/shuttle/shuttle.dm

@@ -217,6 +217,8 @@
 
 	var/launch_status = NOLAUNCH
 
+	var/knockdown = TRUE //Will it knock down mobs when it docks?
+
 	// A timid shuttle will not register itself with the shuttle subsystem
 	// All shuttle templates are timid
 	var/timid = FALSE
@@ -517,7 +519,7 @@
 
 			//move mobile to new location
 			for(var/atom/movable/AM in T0)
-				if(AM.onShuttleMove(T1, rotation))
+				if(AM.onShuttleMove(T1, rotation, knockdown))
 					moved_atoms += AM
 
 		if(rotation)
@@ -578,10 +580,7 @@
 					if(M.pulledby)
 						M.pulledby.stop_pulling()
 					M.stop_pulling()
-					M.visible_message("<span class='warning'>[M] is hit by \
-							a hyperspace ripple!</span>",
-							"<span class='userdanger'>You feel an immense \
-							crushing pressure as the space around you ripples.</span>")
+					M.visible_message("<span class='warning'>[src] slams into [M]!</span>")
 					if(M.key || M.get_ghost(TRUE))
 						SSblackbox.add_details("shuttle_gib", "[type]")
 					else

code/modules/spells/spell_types/mind_transfer.dm

@@ -62,29 +62,14 @@ Also, you never added distance checking after target is selected. I've went ahea
 	var/mob/caster = user//The wizard/whomever doing the body transferring.
 
 	//MIND TRANSFER BEGIN
-	if(caster.mind.special_verbs.len)//If the caster had any special verbs, remove them from the mob verb list.
-		for(var/V in caster.mind.special_verbs)//Since the caster is using an object spell system, this is mostly moot.
-			caster.verbs -= V//But a safety nontheless.
-
-	if(victim.mind.special_verbs.len)//Now remove all of the victim's verbs.
-		for(var/V in victim.mind.special_verbs)
-			victim.verbs -= V
-
 	var/mob/dead/observer/ghost = victim.ghostize(0)
 	caster.mind.transfer_to(victim)
 
-	if(victim.mind.special_verbs.len)//To add all the special verbs for the original caster.
-		for(var/V in caster.mind.special_verbs)//Not too important but could come into play.
-			caster.verbs += V
-
 	ghost.mind.transfer_to(caster)
 	if(ghost.key)
 		caster.key = ghost.key	//have to transfer the key since the mind was not active
 	qdel(ghost)
 
-	if(caster.mind.special_verbs.len)//If they had any special verbs, we add them here.
-		for(var/V in caster.mind.special_verbs)
-			caster.verbs += V
 	//MIND TRANSFER END
 
 	//Here we paralyze both mobs and knock them out for a time.

code/modules/surgery/bodyparts/dismemberment.dm

@@ -218,6 +218,14 @@
 		for(var/X in list(owner.glasses, owner.ears, owner.wear_mask, owner.head))
 			var/obj/item/I = X
 			owner.dropItemToGround(I, TRUE)
+
+	//Handle dental implants
+	for(var/datum/action/item_action/hands_free/activate_pill/AP in owner.actions)
+		AP.Remove(owner)
+		var/obj/pill = AP.target
+		if(pill)
+			pill.forceMove(src)
+
 	name = "[owner.real_name]'s head"
 	..()
 
@@ -300,6 +308,14 @@
 		C.real_name = real_name
 	real_name = ""
 	name = initial(name)
+
+	//Handle dental implants
+	for(var/obj/item/weapon/reagent_containers/pill/P in src)
+		for(var/datum/action/item_action/hands_free/activate_pill/AP in P.actions)
+			P.forceMove(C)
+			AP.Grant(C)
+			break
+
 	..()
 
 

code/modules/surgery/bodyparts/head.dm

@@ -48,7 +48,10 @@
 			brain = null
 			update_icon_dropped()
 		else
-			I.loc = T
+			if(istype(I, /obj/item/weapon/reagent_containers/pill))
+				for(var/datum/action/item_action/hands_free/activate_pill/AP in I.actions)
+					qdel(AP)
+			I.forceMove(T)
 
 /obj/item/bodypart/head/update_limb(dropping_limb, mob/living/carbon/source)
 	var/mob/living/carbon/C

code/modules/surgery/dental_implant.dm

@@ -18,10 +18,10 @@
 	user.drop_item()
 	tool.loc = target
 
-	var/datum/action/item_action/hands_free/activate_pill/P = new
+	var/datum/action/item_action/hands_free/activate_pill/P = new(tool)
 	P.button.name = "Activate [tool.name]"
 	P.target = tool
-	P.Grant(target)
+	P.Grant(target)	//The pill never actually goes in an inventory slot, so the owner doesn't inherit actions from it
 
 	user.visible_message("[user] wedges \the [tool] into [target]'s [parse_zone(target_zone)]!", "<span class='notice'>You wedge [tool] into [target]'s [parse_zone(target_zone)].</span>")
 	return 1
@@ -37,6 +37,5 @@
 	if(target.reagents.total_volume)
 		target.reagents.reaction(owner, INGEST)
 		target.reagents.trans_to(owner, target.reagents.total_volume)
-	Remove(owner)
 	qdel(target)
 	return 1

code/modules/surgery/organs/ears.dm

@@ -4,6 +4,7 @@
 	desc = "There are three parts to the ear. Inner, middle and outer. Only one of these parts should be normally visible."
 	zone = "head"
 	slot = "ears"
+	gender = PLURAL
 
 	// `deaf` measures "ticks" of deafness. While > 0, the person is unable
 	// to hear anything.

code/modules/surgery/organs/eyes.dm

@@ -4,6 +4,7 @@
 	desc = "I see you!"
 	zone = "eyes"
 	slot = "eye_sight"
+	gender = PLURAL
 
 	var/sight_flags = 0
 	var/see_in_dark = 2

code/modules/surgery/organs/vocal_cords.dm

@@ -8,6 +8,7 @@
 	icon_state = "appendix"
 	zone = "mouth"
 	slot = "vocal_cords"
+	gender = PLURAL
 	var/list/spans = null
 
 /obj/item/organ/vocal_cords/proc/can_speak_with() //if there is any limitation to speaking with these cords