Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26492

2017-05-17 09:58:53 -05:00
parent 717d63f129 da2fc1da0d
commit d7c24de679
808 changed files with 31788 additions and 17401 deletions
@@ -129,7 +129,7 @@
 	name = "footprints"
 	icon = 'icons/effects/footprints.dmi'
 	icon_state = "nothingwhatsoever"
-	desc = "where might they lead?"
+	desc = "WHOSE FOOTPRINTS ARE THESE?"
 	random_icon_states = null
 	var/entered_dirs = 0
 	var/exited_dirs = 0
@@ -74,7 +74,7 @@
 /obj/effect/particle_effect/smoke/proc/spread_smoke()
 	var/turf/t_loc = get_turf(src)
 	if(!t_loc)
-		return 
+		return
 	var/list/newsmokes = list()
 	for(var/turf/T in t_loc.GetAtmosAdjacentTurfs())
 		var/obj/effect/particle_effect/smoke/foundsmoke = locate() in T //Don't spread smoke where there's already smoke!
@@ -94,7 +94,7 @@
 	name = "Head of Personnel"

 /obj/effect/landmark/start/librarian
-	name = "Librarian"
+	name = "Curator"

 /obj/effect/landmark/start/lawyer
 	name = "Lawyer"
@@ -31,8 +31,8 @@
 	. = ..()
 	deltimer(timerid)

-/obj/effect/overlay/temp/New()
-	..()
+/obj/effect/overlay/temp/Initialize()
+	. = ..()
 	if(randomdir)
 		setDir(pick(GLOB.cardinal))

@@ -44,10 +44,10 @@
 /obj/effect/overlay/temp/dir_setting
 	randomdir = FALSE

-/obj/effect/overlay/temp/dir_setting/New(loc, set_dir)
+/obj/effect/overlay/temp/dir_setting/Initialize(mapload, set_dir)
 	if(set_dir)
 		setDir(set_dir)
-	..()
+	. = ..()

 /obj/effect/overlay/temp/dir_setting/bloodsplatter
 	icon = 'icons/effects/blood.dmi'
@@ -56,12 +56,12 @@
 	layer = BELOW_MOB_LAYER
 	var/splatter_type = "splatter"

-/obj/effect/overlay/temp/dir_setting/bloodsplatter/New(loc, set_dir)
+/obj/effect/overlay/temp/dir_setting/bloodsplatter/Initialize(mapload, set_dir)
 	if(set_dir in GLOB.diagonals)
 		icon_state = "[splatter_type][pick(1, 2, 6)]"
 	else
 		icon_state = "[splatter_type][pick(3, 4, 5)]"
-	..()
+	. = ..()
 	var/target_pixel_x = 0
 	var/target_pixel_y = 0
 	switch(set_dir)
@@ -93,6 +93,13 @@
 /obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter
 	splatter_type = "xsplatter"

+/obj/effect/overlay/temp/dir_setting/speedbike_trail
+	name = "speedbike trails"
+	icon_state = "ion_fade"
+	layer = BELOW_MOB_LAYER
+	duration = 10
+	randomdir = 0
+
 /obj/effect/overlay/temp/dir_setting/firing_effect
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "firing_effect"
@@ -189,8 +196,8 @@
 	desc = "It's a decoy!"
 	duration = 15

-/obj/effect/overlay/temp/decoy/New(loc, atom/mimiced_atom)
-	..()
+/obj/effect/overlay/temp/decoy/Initialize(mapload, atom/mimiced_atom)
+	. = ..()
 	alpha = initial(alpha)
 	if(mimiced_atom)
 		name = mimiced_atom.name
@@ -198,8 +205,8 @@
 		setDir(mimiced_atom.dir)
 		mouse_opacity = 0

-/obj/effect/overlay/temp/decoy/fading/New(loc, atom/mimiced_atom)
-	..()
+/obj/effect/overlay/temp/decoy/fading/Initialize(mapload, atom/mimiced_atom)
+	. = ..()
 	animate(src, alpha = 0, time = duration)

 /obj/effect/overlay/temp/decoy/fading/fivesecond
@@ -223,7 +230,15 @@
 	name = "blood sparks"
 	icon_state = "bloodsparkles"

-/obj/effect/overlay/temp/dir_setting/cult/phase
+/obj/effect/overlay/temp/cult/blood  // The traditional teleport
+	name = "blood jaunt"
+	duration = 12
+	icon_state = "bloodin"
+
+/obj/effect/overlay/temp/cult/blood/out
+	icon_state = "bloodout"
+
+/obj/effect/overlay/temp/dir_setting/cult/phase  // The veil shifter teleport
 	name = "phase glow"
 	duration = 7
 	icon_state = "cultin"
@@ -316,23 +331,41 @@
 /obj/effect/overlay/temp/ratvar/grille/broken
 	icon_state = "ratvarbrokengrilleglow"

+/obj/effect/overlay/temp/ratvar/mending_mantra
+	layer = ABOVE_MOB_LAYER
+	duration = 20
+	alpha = 200
+	icon_state = "mending_mantra"
+	light_range = 1.5
+	light_color = "#1E8CE1"
+
+/obj/effect/overlay/temp/ratvar/mending_mantra/Initialize(mapload)
+	. = ..()
+	transform = matrix()*2
+	var/matrix/M = transform
+	M.Turn(90)
+	animate(src, alpha = 20, time = duration, easing = BOUNCE_EASING, flags = ANIMATION_PARALLEL)
+	animate(src, transform = M, time = duration, flags = ANIMATION_PARALLEL)
+
 /obj/effect/overlay/temp/ratvar/volt_hit
 	name = "volt blast"
 	layer = ABOVE_MOB_LAYER
 	duration = 5
 	icon_state = "volt_hit"
+	light_range = 1.5
+	light_power = 2
+	light_color = LIGHT_COLOR_ORANGE
 	var/mob/user
 	var/damage = 20

-/obj/effect/overlay/temp/ratvar/volt_hit/New(loc, caster, multiplier)
+/obj/effect/overlay/temp/ratvar/volt_hit/Initialize(mapload, caster, multiplier)
 	if(multiplier)
 		damage *= multiplier
 	duration = max(round(damage * 0.2), 1)
-	..()
-	set_light(1.5, 2, LIGHT_COLOR_ORANGE)
+	. = ..()

-/obj/effect/overlay/temp/ratvar/volt_hit/true/New(loc, caster, multiplier)
-	..()
+/obj/effect/overlay/temp/ratvar/volt_hit/true/Initialize(mapload, caster, multiplier)
+	. = ..()
 	user = caster
 	if(user)
 		var/matrix/M = new
@@ -376,8 +409,8 @@
 	icon_state = "warden_gaze"
 	duration = 3

-/obj/effect/overlay/temp/ratvar/ocular_warden/New()
-	..()
+/obj/effect/overlay/temp/ratvar/ocular_warden/Initialize()
+	. = ..()
 	pixel_x = rand(-8, 8)
 	pixel_y = rand(-10, 10)
 	animate(src, alpha = 0, time = 3, easing = EASE_OUT)
@@ -401,8 +434,8 @@
 	layer = ABOVE_MOB_LAYER
 	duration = 10

-/obj/effect/overlay/temp/ratvar/component/New()
-	..()
+/obj/effect/overlay/temp/ratvar/component/Initialize()
+	. = ..()
 	transform = matrix()*0.75
 	pixel_x = rand(-10, 10)
 	pixel_y = rand(-10, -2)
@@ -432,9 +465,8 @@
 	light_power = 2
 	light_color = "#FAE48C"

-/obj/effect/overlay/temp/ratvar/sigil/transgression/New()
-	..()
-	update_light()
+/obj/effect/overlay/temp/ratvar/sigil/transgression/Initialize()
+	. = ..()
 	var/oldtransform = transform
 	animate(src, transform = matrix()*2, time = 5)
 	animate(transform = oldtransform, alpha = 0, time = 65)
@@ -447,10 +479,6 @@
 	light_power = 0.5
 	light_color = "#1E8CE1"

-/obj/effect/overlay/temp/ratvar/sigil/vitality/New()
-	..()
-	update_light()
-
 /obj/effect/overlay/temp/ratvar/sigil/accession
 	color = "#AF0AAF"
 	layer = ABOVE_MOB_LAYER
@@ -493,9 +521,9 @@
 	icon = 'icons/mob/mob.dmi'
 	duration = 15

-/obj/effect/overlay/temp/gib_animation/New(loc, gib_icon)
+/obj/effect/overlay/temp/gib_animation/Initialize(mapload, gib_icon)
 	icon_state = gib_icon // Needs to be before ..() so icon is correct
-	..()
+	. = ..()

 /obj/effect/overlay/temp/gib_animation/ex_act(severity)
 	return //so the overlay isn't deleted by the explosion that gibbed the mob.
@@ -507,9 +535,9 @@
 	icon = 'icons/mob/mob.dmi'
 	duration = 15

-/obj/effect/overlay/temp/dust_animation/New(loc, dust_icon)
+/obj/effect/overlay/temp/dust_animation/Initialize(mapload, dust_icon)
 	icon_state = dust_icon // Before ..() so the correct icon is flick()'d
-	..()
+	. = ..()

 /obj/effect/overlay/temp/mummy_animation
 	icon = 'icons/mob/mob.dmi'
@@ -521,12 +549,12 @@
 	icon_state = "heal"
 	duration = 15

-/obj/effect/overlay/temp/heal/New(loc, colour)
-	..()
-	pixel_x = rand(-12, 12)
-	pixel_y = rand(-9, 0)
+/obj/effect/overlay/temp/heal/Initialize(mapload, colour)
 	if(colour)
 		color = colour
+	. = ..()
+	pixel_x = rand(-12, 12)
+	pixel_y = rand(-9, 0)

 /obj/effect/overlay/temp/kinetic_blast
 	name = "kinetic explosion"
@@ -558,14 +586,14 @@
 	icon_state = "impact_bullet"
 	duration = 5

-/obj/effect/overlay/temp/impact_effect/New(loc, atom/target, obj/item/projectile/P)
+/obj/effect/overlay/temp/impact_effect/Initialize(mapload, atom/target, obj/item/projectile/P)
 	if(target == P.original) //the projectile hit the target originally clicked
 		pixel_x = P.p_x + target.pixel_x - 16 + rand(-4,4)
 		pixel_y = P.p_y + target.pixel_y - 16 + rand(-4,4)
 	else
 		pixel_x = target.pixel_x + rand(-4,4)
 		pixel_y = target.pixel_y + rand(-4,4)
-	..()
+	. = ..()

 /obj/effect/overlay/temp/impact_effect/red_laser
 	icon_state = "impact_laser"
@@ -591,6 +619,18 @@
 	icon_state = "shieldsparkles"
 	duration = 6

+/obj/effect/overlay/temp/heart
+	name = "heart"
+	icon = 'icons/mob/animal.dmi'
+	icon_state = "heart"
+	duration = 25
+
+/obj/effect/overlay/temp/heart/Initialize(mapload)
+	. = ..()
+	pixel_x = rand(-4,4)
+	pixel_y = rand(-4,4)
+
+	animate(src, pixel_y = pixel_y + 32, alpha = 0, time = 25)

 /obj/effect/overlay/palmtree_r
 	name = "Palm tree"
@@ -63,7 +63,7 @@
 		return
 	if (istype(M, /atom/movable))
 		if(ismegafauna(M))
-			message_admins("[M] (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[M]'>FLW</A>) has teleported through [src].")
+			message_admins("[M] [ADMIN_FLW(M)] has teleported through [src].")
 		do_teleport(M, target, precision) ///You will appear adjacent to the beacon


@@ -9,10 +9,12 @@
 	host = _host
 	last_host_loc = _host.loc
 	ignore_if_not_on_turf = _ignore_if_not_on_turf
+	checkers = list()
 	SetRange(range)

 /datum/proximity_monitor/Destroy()
 	host = null
+	last_host_loc = null
 	QDEL_LIST(checkers)
 	return ..()

@@ -34,46 +36,47 @@
 	
 	current_range = range

-	var/list/old_checkers = checkers
-	var/old_checkers_len = LAZYLEN(old_checkers)
+	var/list/checkers_local = checkers
+	var/old_checkers_len = checkers_local.len

-	var/atom/host_loc = host.loc
+	var/atom/_host = host

-	var/atom/loc_to_use = ignore_if_not_on_turf ? host_loc : get_turf(host)
+	var/atom/loc_to_use = ignore_if_not_on_turf ? _host.loc : get_turf(_host)
 	if(!isturf(loc_to_use))	//only check the host's loc
 		if(range)
 			var/obj/effect/abstract/proximity_checker/pc
 			if(old_checkers_len)
-				pc = old_checkers[old_checkers_len]
-				--old_checkers.len
+				pc = checkers_local[old_checkers_len]
+				--checkers_local.len
+				QDEL_LIST(checkers_local)
 			else
-				pc = new(host_loc, src)
+				pc = new(loc_to_use, src)

-			checkers = list(pc)	//only check the host's loc
+			checkers_local += pc	//only check the host's loc
 		return

 	var/list/turfs = RANGE_TURFS(range, loc_to_use)
-	var/old_checkers_used = min(turfs.len, old_checkers_len)
+	var/turfs_len = turfs.len
+	var/old_checkers_used = min(turfs_len, old_checkers_len)

 	//reuse what we can
 	for(var/I in 1 to old_checkers_len)
 		if(I <= old_checkers_used)
-			var/obj/effect/abstract/proximity_checker/pc = old_checkers[I]
+			var/obj/effect/abstract/proximity_checker/pc = checkers_local[I]
 			pc.loc = turfs[I]
 		else
-			qdel(old_checkers[I])	//delete the leftovers
+			qdel(checkers_local[I])	//delete the leftovers

-	LAZYCLEARLIST(old_checkers)
-
-	//create what we lack
-	var/list/checkers_local = list()
-	for(var/I in (old_checkers_used + 1) to turfs.len)
-		checkers_local += new /obj/effect/abstract/proximity_checker(turfs[I], src)
-	
-	checkers = checkers_local
+	if(old_checkers_len < turfs_len)
+		//create what we lack
+		for(var/I in (old_checkers_used + 1) to turfs_len)
+			checkers_local += new /obj/effect/abstract/proximity_checker(turfs[I], src)
+	else
+		checkers_local.Cut(old_checkers_used + 1, old_checkers_len)

 /obj/effect/abstract/proximity_checker
 	invisibility = INVISIBILITY_ABSTRACT
+	anchored = TRUE
 	var/datum/proximity_monitor/monitor

 /obj/effect/abstract/proximity_checker/Initialize(mapload, datum/proximity_monitor/_monitor)
@@ -81,8 +84,8 @@
 	if(_monitor)
 		monitor = _monitor
 	else
-		stack_trace("proximity_checker created without proximity_monitor")
-		qdel(src)
+		stack_trace("proximity_checker created without host")
+		return INITIALIZE_HINT_QDEL

 /obj/effect/abstract/proximity_checker/Destroy()
 	monitor = null
@@ -90,9 +93,6 @@

 /obj/effect/abstract/proximity_checker/Crossed(atom/movable/AM)
 	set waitfor = FALSE
-	var/datum/proximity_monitor/M = monitor
-	if(!M.current_range)
-		return
-	var/atom/H = M.host
+	var/atom/H = monitor.host
 	testing("HasProx: [H] -> [AM]")
 	H.HasProximity(AM)
@@ -1,10 +1,15 @@
-/proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, ignorecap = 0, flame_range = 0 ,silent = 0, smoke = 1)
+/proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, ignorecap = 0, flame_range, silent = 0, smoke = 1)
 	set waitfor = 0
 	src = null //so we don't abort once src is deleted
 	epicenter = get_turf(epicenter)
 	if(!epicenter)
 		return

+	if(isnull(flame_range))
+		flame_range = light_impact_range
+	if(isnull(flash_range))
+		flash_range = devastation_range
+
 	// Archive the uncapped explosion for the doppler array
 	var/orig_dev_range = devastation_range
 	var/orig_heavy_range = heavy_impact_range
@@ -1,10 +0,0 @@
-diff a/code/game/objects/items.dm b/code/game/objects/items.dm	(rejected hunks)
-@@ -102,7 +102,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
- /obj/item/Initialize()
- 	if (!materials)
- 		materials = list()
-	..()
-+	. = ..()
- 	for(var/path in actions_types)
- 		new path(src)
- 	actions_types = null
@@ -7,6 +7,7 @@
 	desc = "An official document entrusting the governance of the station \
 		and surrounding space to the Captain. "
 	var/used = FALSE
+	var/name_type = "station"

 	var/unlimited_uses = FALSE
 	var/ignores_timeout = FALSE
@@ -33,10 +34,10 @@

 /obj/item/station_charter/attack_self(mob/living/user)
 	if(used)
-		to_chat(user, "This charter has already been used to name the station.")
+		to_chat(user, "The [name_type] has already been named.")
 		return
 	if(!ignores_timeout && (world.time-SSticker.round_start_time > STATION_RENAME_TIME_LIMIT)) //5 minutes
-		to_chat(user, "The crew has already settled into the shift. It probably wouldn't be good to rename the station right now.")
+		to_chat(user, "The crew has already settled into the shift. It probably wouldn't be good to rename the [name_type] right now.")
 		return
 	if(response_timer_id)
 		to_chat(user, "You're still waiting for approval from your employers about your proposed name change, it'd be best to wait for now.")
@@ -60,7 +61,7 @@
 	to_chat(user, "Your name has been sent to your employers for approval.")
 	// Autoapproves after a certain time
 	response_timer_id = addtimer(CALLBACK(src, .proc/rename_station, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE)
-	to_chat(GLOB.admins, "<span class='adminnotice'><b><font color=orange>CUSTOM STATION RENAME:</font></b>[key_name_admin(user)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) proposes to rename the station to [new_name] (will autoapprove in [approval_time / 10] seconds). [ADMIN_SMITE(user)] (<A HREF='?_src_=holder;reject_custom_name=\ref[src]'>REJECT</A>) (<a href='?_src_=holder;CentcommReply=\ref[user]'>RPLY</a>)</span>")
+	to_chat(GLOB.admins, "<span class='adminnotice'><b><font color=orange>CUSTOM STATION RENAME:</font></b>[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [new_name] (will autoapprove in [approval_time / 10] seconds). [ADMIN_SMITE(user)] (<A HREF='?_src_=holder;reject_custom_name=\ref[src]'>REJECT</A>) [ADMIN_CENTCOM_REPLY(user)]</span>")

 /obj/item/station_charter/proc/reject_proposed(user)
 	if(!user)
@@ -86,7 +87,7 @@
 	name = "station charter for [station_name()]"
 	desc = "An official document entrusting the governance of \
 		[station_name()] and surrounding space to Captain [uname]."
-	feedback_set_details("station_renames","[station_name()]")
+	SSblackbox.set_details("station_renames","[station_name()]")
 	if(!unlimited_uses)
 		used = TRUE

@@ -94,4 +95,27 @@
 	unlimited_uses = TRUE
 	ignores_timeout = TRUE

+
+/obj/item/weapon/station_charter/flag
+	name = "nanotrasen banner"
+	icon = 'icons/obj/items.dmi'
+	var/name_type = "planet"
+	icon_state = "banner"
+	item_state = "banner"
+	desc = "A cunning device used to claim ownership of planets."
+	w_class = 5
+	force = 15
+
+/obj/item/station_charter/flag/rename_station(designation, uname, ureal_name, ukey)
+	set_station_name(designation)
+	minor_announce("[ureal_name] has designated the planet as [station_name()]", "Captain's Banner", 0)
+	log_game("[ukey] has renamed the planet as [station_name()].")
+	name = "banner of [station_name()]"
+	desc = "The banner bears the official coat of arms of Nanotrasen, signifying that [station_name()] has been claimed by Captain [uname] in the name of the company."
+	SSblackbox.set_details("station_renames","[station_name()]")
+	if(!unlimited_uses)
+		used = TRUE
+
+
+
 #undef STATION_RENAME_TIME_LIMIT
@@ -161,11 +161,11 @@
 	icon_state = "pda-roboticist"
 	default_cartridge = /obj/item/weapon/cartridge/roboticist

-/obj/item/device/pda/librarian
-	name = "librarian PDA"
+/obj/item/device/pda/curator
+	name = "curator PDA"
 	icon_state = "pda-library"
 	icon_alert = "pda-r-library"
-	default_cartridge = /obj/item/weapon/cartridge/librarian
+	default_cartridge = /obj/item/weapon/cartridge/curator
 	desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a WGW-11 series e-reader."
 	note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!"
 	silent = 1 //Quiet in the library!
@@ -108,7 +108,7 @@
 	access_mime = 1
 	var/mime_charges = 5

-/obj/item/weapon/cartridge/librarian
+/obj/item/weapon/cartridge/curator
 	name = "\improper Lib-Tweet cartridge"
 	icon_state = "cart-s"
 	access_newscaster = 1
@@ -37,9 +37,9 @@
 	return 1


-/obj/item/device/flashlight/attack(mob/living/carbon/human/M, mob/living/carbon/human/user)
+/obj/item/device/flashlight/attack(mob/living/carbon/M, mob/living/carbon/human/user)
 	add_fingerprint(user)
-	if(on && user.zone_selected == "eyes")
+	if(istype(M) && on && user.zone_selected in list("eyes", "mouth"))

 		if((user.disabilities & CLUMSY || user.getBrainLoss() >= 60) && prob(50))	//too dumb to use flashlight properly
 			return ..()	//just hit them in the head
@@ -48,28 +48,101 @@
 			to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
 			return

-		var/mob/living/carbon/human/H = M	//mob has protective eyewear
-		if(ishuman(M) && ((H.head && H.head.flags_cover & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags_cover & MASKCOVERSEYES) || (H.glasses && H.glasses.flags_cover & GLASSESCOVERSEYES)))
-			to_chat(user, "<span class='notice'>You're going to need to remove that [(H.head && H.head.flags_cover & HEADCOVERSEYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags_cover & MASKCOVERSEYES) ? "mask": "glasses"] first.</span>")
+		if(!M.get_bodypart("head"))
+			to_chat(user, "<span class='warning'>[M] doesn't have a head!</span>")
 			return

-		if(M == user)	//they're using it on themselves
-			if(M.flash_act(visual = 1))
-				M.visible_message("[M] directs [src] to [M.p_their()] eyes.", "<span class='notice'>You wave the light in front of your eyes! Trippy!</span>")
-			else
-				M.visible_message("[M] directs [src] to [M.p_their()] eyes.", "<span class='notice'>You wave the light in front of your eyes.</span>")
-		else
-			user.visible_message("<span class='warning'>[user] directs [src] to [M]'s eyes.</span>", \
-								 "<span class='danger'>You direct [src] to [M]'s eyes.</span>")
-			var/mob/living/carbon/C = M
-			if(istype(C))
-				if(C.stat == DEAD || (C.disabilities & BLIND)) //mob is dead or fully blind
-					to_chat(user, "<span class='warning'>[C] pupils don't react to the light!</span>")
-				else if(C.dna.check_mutation(XRAY))	//mob has X-RAY vision
-					to_chat(user, "<span class='danger'>[C] pupils give an eerie glow!</span>")
-				else //they're okay!
-					if(C.flash_act(visual = 1))
-						to_chat(user, "<span class='notice'>[C]'s pupils narrow.</span>")
+		switch(user.zone_selected)
+			if("eyes")
+				if((M.head && M.head.flags_cover & HEADCOVERSEYES) || (M.wear_mask && M.wear_mask.flags_cover & MASKCOVERSEYES) || (M.glasses && M.glasses.flags_cover & GLASSESCOVERSEYES))
+					to_chat(user, "<span class='notice'>You're going to need to remove that [(M.head && M.head.flags_cover & HEADCOVERSEYES) ? "helmet" : (M.wear_mask && M.wear_mask.flags_cover & MASKCOVERSEYES) ? "mask": "glasses"] first.</span>")
+					return
+
+				var/obj/item/organ/eyes/E = M.getorganslot("eye_sight")
+				if(!E)
+					to_chat(user, "<span class='danger'>[M] doesn't have any eyes!</span>")
+					return
+
+				if(M == user)	//they're using it on themselves
+					if(M.flash_act(visual = 1))
+						M.visible_message("[M] directs [src] to [M.p_their()] eyes.", "<span class='notice'>You wave the light in front of your eyes! Trippy!</span>")
+					else
+						M.visible_message("[M] directs [src] to [M.p_their()] eyes.", "<span class='notice'>You wave the light in front of your eyes.</span>")
+				else
+					user.visible_message("<span class='warning'>[user] directs [src] to [M]'s eyes.</span>", \
+										 "<span class='danger'>You direct [src] to [M]'s eyes.</span>")
+					if(M.stat == DEAD || (M.disabilities & BLIND) || !M.flash_act(visual = 1)) //mob is dead or fully blind
+						to_chat(user, "<span class='warning'>[M]'s pupils don't react to the light!</span>")
+					else if(M.dna && M.dna.check_mutation(XRAY))	//mob has X-RAY vision
+						to_chat(user, "<span class='danger'>[M]'s pupils give an eerie glow!</span>")
+					else //they're okay!
+						to_chat(user, "<span class='notice'>[M]'s pupils narrow.</span>")
+
+			if("mouth")
+
+				if((M.head && M.head.flags_cover & HEADCOVERSMOUTH) || (M.wear_mask && M.wear_mask.flags_cover & MASKCOVERSMOUTH))
+					to_chat(user, "<span class='notice'>You're going to need to remove that [(M.head && M.head.flags_cover & HEADCOVERSMOUTH) ? "helmet" : "mask"] first.</span>")
+					return
+
+				var/their = M.p_their()
+
+				var/list/mouth_organs = new
+				for(var/obj/item/organ/O in M.internal_organs)
+					if(O.zone == "mouth")
+						mouth_organs.Add(O)
+				var/organ_list = ""
+				var/organ_count = LAZYLEN(mouth_organs)
+				if(organ_count)
+					for(var/I in 1 to organ_count)
+						if(I > 1)
+							if(I == mouth_organs.len)
+								organ_list += ", and "
+							else
+								organ_list += ", "
+						var/obj/item/organ/O = mouth_organs[I]
+						organ_list += (O.gender == "plural" ? O.name : "\an [O.name]")
+
+				var/pill_count = 0
+				for(var/datum/action/item_action/hands_free/activate_pill/AP in M.actions)
+					pill_count++
+
+				if(M == user)
+					var/can_use_mirror = FALSE
+					if(isturf(user.loc))
+						var/obj/structure/mirror/mirror = locate(/obj/structure/mirror, user.loc)
+						if(mirror)
+							switch(user.dir)
+								if(NORTH)
+									can_use_mirror = mirror.pixel_y > 0
+								if(SOUTH)
+									can_use_mirror = mirror.pixel_y < 0
+								if(EAST)
+									can_use_mirror = mirror.pixel_x > 0
+								if(WEST)
+									can_use_mirror = mirror.pixel_x < 0
+
+					M.visible_message("[M] directs [src] to [their] mouth.", \
+					"<span class='notice'>You point [src] into your mouth.</span>")
+					if(!can_use_mirror)
+						to_chat(user, "<span class='notice'>You can't see anything without a mirror.</span>")
+						return
+					if(organ_count)
+						to_chat(user, "<span class='notice'>Inside your mouth [organ_count > 1 ? "are" : "is"] [organ_list].</span>")
+					else
+						to_chat(user, "<span class='notice'>There's nothing inside your mouth.</span>")
+					if(pill_count)
+						to_chat(user, "<span class='notice'>You have [pill_count] implanted pill[pill_count > 1 ? "s" : ""].</span>")
+
+				else
+					user.visible_message("<span class='notice'>[user] directs [src] to [M]'s mouth.</span>",\
+										 "<span class='notice'>You direct [src] to [M]'s mouth.</span>")
+					if(organ_count)
+						to_chat(user, "<span class='notice'>Inside [their] mouth [organ_count > 1 ? "are" : "is"] [organ_list].</span>")
+					else
+						to_chat(user, "<span class='notice'>[M] doesn't have any organs in [their] mouth.</span>")
+					if(pill_count)
+						to_chat(user, "<span class='notice'>[M] has [pill_count] pill[pill_count > 1 ? "s" : ""] implanted in [their] teeth.")
+
 	else
 		return ..()

@@ -100,8 +173,8 @@
 	icon_state = "medi_holo"
 	duration = 30

-/obj/effect/overlay/temp/medical_holosign/New(loc, creator)
-	..()
+/obj/effect/overlay/temp/medical_holosign/Initialize(mapload, creator)
+	. = ..()
 	playsound(loc, 'sound/machines/ping.ogg', 50, 0) //make some noise!
 	if(creator)
 		visible_message("<span class='danger'>[creator] created a medical hologram!</span>")
@@ -280,7 +353,7 @@
 	return TRUE

 /obj/item/device/flashlight/emp/attack(mob/living/M, mob/living/user)
-	if(on && user.zone_selected == "eyes") // call original attack proc only if aiming at the eyes
+	if(on && user.zone_selected in list("eyes", "mouth")) // call original attack when examining organs
 		..()
 	return

@@ -7,10 +7,14 @@ GLOBAL_LIST_EMPTY(GPS_list)
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = SLOT_BELT
 	origin_tech = "materials=2;magnets=1;bluespace=2"
+	unique_rename = TRUE
 	var/gpstag = "COM0"
 	var/emped = FALSE
 	var/turf/locked_location
 	var/tracking = TRUE
+	var/updating = TRUE //Automatic updating of GPS list. Can be set to manual by user.
+	var/global_mode = TRUE //If disabled, only GPS signals of the same Z level are shown
+

 /obj/item/device/gps/Initialize()
 	..()
@@ -27,6 +31,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
 	cut_overlay("working")
 	add_overlay("emp")
 	addtimer(CALLBACK(src, .proc/reboot), 300, TIMER_OVERRIDE) //if a new EMP happens, remove the old timer so it doesn't reactivate early
+	SStgui.close_uis(src) //Close the UI control if it is open.

 /obj/item/device/gps/proc/reboot()
 	emped = FALSE
@@ -34,6 +39,9 @@ GLOBAL_LIST_EMPTY(GPS_list)
 	add_overlay("working")

 /obj/item/device/gps/AltClick(mob/user)
+	toggletracking(user)
+
+/obj/item/device/gps/proc/toggletracking(mob/user)
 	if(!user.canUseTopic(src, be_close=TRUE))
 		return //user not valid to use gps
 	if(emped)
@@ -48,45 +56,89 @@ GLOBAL_LIST_EMPTY(GPS_list)
 		to_chat(user, "[src] is now tracking, and visible to other GPS devices.")
 		tracking = TRUE

-/obj/item/device/gps/attack_self(mob/user)
-	if(!tracking)
-		to_chat(user, "[src] is turned off. Use alt+click to toggle it back on.")
-		return

-	var/obj/item/device/gps/t = ""
-	var/gps_window_height = 110 + GLOB.GPS_list.len * 20 // Variable window height, depending on how many GPS units there are to show
+/obj/item/device/gps/ui_interact(mob/user, ui_key = "gps", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) // Remember to use the appropriate state.
 	if(emped)
-		t += "ERROR"
-	else
-		t += "<BR><A href='?src=\ref[src];tag=1'>Set Tag</A> "
-		t += "<BR>Tag: [gpstag]"
-		if(locked_location && locked_location.loc)
-			t += "<BR>Bluespace coordinates saved: [locked_location.loc]"
-			gps_window_height += 20
-
-		for(var/obj/item/device/gps/G in GLOB.GPS_list)
-			var/turf/pos = get_turf(G)
-			var/area/gps_area = get_area(G)
-			var/tracked_gpstag = G.gpstag
-			if(G.emped == 1)
-				t += "<BR>[tracked_gpstag]: ERROR"
-			else if(G.tracking)
-				t += "<BR>[tracked_gpstag]: [format_text(gps_area.name)] ([pos.x], [pos.y], [pos.z])"
-			else
-				continue
-	var/datum/browser/popup = new(user, "GPS", name, 360, min(gps_window_height, 800))
-	popup.set_content(t)
-	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-	popup.open()
+		to_chat(user, "[src] fizzles weakly.")
+		return
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		var/gps_window_height = 300 + GLOB.GPS_list.len * 20 // Variable window height, depending on how many GPS units there are to show
+		ui = new(user, src, ui_key, "gps", "Global Positioning System", 600, gps_window_height, master_ui, state) //width, height
+		ui.open()
+
+	ui.set_autoupdate(state = updating)
+
+
+/obj/item/device/gps/ui_data(mob/user)
+	var/list/data = list()
+	data["power"] = tracking
+	data["tag"] = gpstag
+	data["updating"] = updating
+	data["globalmode"] = global_mode
+	if(!tracking || emped) //Do not bother scanning if the GPS is off or EMPed
+		return data
+
+	var/turf/curr = get_turf(src)
+	data["current"] = "[get_area_name(curr)] ([curr.x], [curr.y], [curr.z])"
+
+	var/list/signals = list()
+	data["signals"] = list()
+
+	for(var/gps in GLOB.GPS_list)
+		var/obj/item/device/gps/G = gps
+		if(G.emped || !G.tracking || G == src)
+			continue
+		var/turf/pos = get_turf(G)
+		if(!global_mode && pos.z != curr.z)
+			continue
+		var/area/gps_area = get_area_name(G)
+		var/list/signal = list()
+		signal["entrytag"] = G.gpstag //Name or 'tag' of the GPS
+		signal["area"] = format_text(gps_area)
+		signal["coord"] = "[pos.x], [pos.y], [pos.z]"
+		if(pos.z == curr.z) //Distance/Direction calculations for same z-level only
+			signal["dist"] = max(get_dist(curr, pos), 0) //Distance between the src and remote GPS turfs
+			signal["degrees"] = round(Get_Angle(curr, pos)) //0-360 degree directional bearing, for more precision.
+			var/direction = uppertext(dir2text(get_dir(curr, pos))) //Direction text (East, etc). Not as precise, but still helpful.
+			if(!direction)
+				direction = "CENTER"
+				signal["degrees"] = "N/A"
+			signal["direction"] = direction
+
+		signals += list(signal) //Add this signal to the list of signals
+	data["signals"] = signals
+	return data
+
+
+
+/obj/item/device/gps/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("rename")
+			var/a = input("Please enter desired tag.", name, gpstag) as text
+			a = uppertext(copytext(sanitize(a), 1, 5))
+			gpstag = a
+			name = "global positioning system ([gpstag])"
+			. = TRUE
+		if("power")
+			toggletracking(usr)
+			. = TRUE
+		if("updating")
+			updating = !updating
+			. = TRUE
+		if("globalmode")
+			global_mode = !global_mode
+			. = TRUE

 /obj/item/device/gps/Topic(href, href_list)
 	..()
 	if(href_list["tag"] )
 		var/a = input("Please enter desired tag.", name, gpstag) as text
-		a = uppertext(copytext(sanitize(a), 1, 5))
+		a = copytext(sanitize(a), 1, 20)
 		if(in_range(src, usr))
 			gpstag = a
-			name = "global positioning system ([gpstag])"
 			attack_self(usr)

 /obj/item/device/gps/science
@@ -157,4 +209,4 @@ GLOBAL_LIST_EMPTY(GPS_list)
 		clear()
 	tagged = null
 	STOP_PROCESSING(SSfastprocess, src)
-	. = ..()
+	. = ..()
@@ -95,8 +95,8 @@
 				"[user] activates \the [src]!", \
 				"<span class='notice'>You activate \the [src].</span>",
 				"<span class='italics'>You hear a click.</span>")
-			message_admins("Power sink activated by [key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) at ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)")
-			log_game("Power sink activated by [key_name(user)] at ([x],[y],[z])")
+			message_admins("Power sink activated by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(src)]")
+			log_game("Power sink activated by [key_name(user)] at [COORD(src)]")
 			set_mode(OPERATING)

 		if(OPERATING)
@@ -178,21 +178,21 @@

 		var/log_attacher = ""
 		if(attacher)
-			log_attacher = "(<A HREF='?_src_=holder;adminmoreinfo=\ref[attacher]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[attacher]'>FLW</A>)"
+			log_attacher = "[ADMIN_QUE(attacher)] [ADMIN_FLW(attacher)]"

 		var/mob/mob = get_mob_by_key(src.fingerprintslast)
 		var/last_touch_info = ""
 		if(mob)
-			last_touch_info = "(<A HREF='?_src_=holder;adminmoreinfo=\ref[mob]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[mob]'>FLW</A>)"
+			last_touch_info = "[ADMIN_QUE(mob)] [ADMIN_FLW(mob)]"

 		var/log_str3 = " Last touched by: [key_name_admin(mob)]"

-		var/bomb_message = "[log_str1] <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name]</a>  [log_str2][log_attacher] [log_str3][last_touch_info]"
+		var/bomb_message = "[log_str1] [A.name][ADMIN_JMP(bombturf)] [log_str2][log_attacher] [log_str3][last_touch_info]"

 		GLOB.bombers += bomb_message

 		message_admins(bomb_message, 0, 1)
-		log_game("[log_str1] [A.name]([A.x],[A.y],[A.z]) [log_str2] [log_str3]")
+		log_game("[log_str1] [A.name][COORD(bombturf)] [log_str2] [log_str3]")
 		merge_gases()
 		spawn(20) // In case one tank bursts
 			for (var/i=0,i<5,i++)
@@ -58,7 +58,7 @@
 	if(src.l_arm && src.r_arm)
 		if(src.l_leg && src.r_leg)
 			if(src.chest && src.head)
-				feedback_inc("cyborg_frames_built",1)
+				SSblackbox.inc("cyborg_frames_built",1)
 				return 1
 	return 0

@@ -235,7 +235,7 @@
 			O.mmi = W //and give the real mmi to the borg.
 			O.updatename()

-			feedback_inc("cyborg_birth",1)
+			SSblackbox.inc("cyborg_birth",1)

 			forceMove(O)
 			O.robot_suit = src
@@ -237,6 +237,7 @@
 /obj/item/borg/upgrade/selfrepair/proc/check_dropped()
 	if(loc != cyborg)
 		toggle_action.Remove(cyborg)
+		QDEL_NULL(toggle_action)
 		cyborg = null
 		deactivate()

@@ -399,4 +400,4 @@
 		return

 	R.make_shell(src)
-	return TRUE
+	return TRUE
@@ -29,6 +29,7 @@ Mineral Sheets
 GLOBAL_LIST_INIT(sandstone_recipes, list ( \
 	new/datum/stack_recipe("pile of dirt", /obj/machinery/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("aesthetic volcanic floor tile", /obj/item/stack/tile/basalt, 2, 2, 4, 20), \
 	new/datum/stack_recipe("Assistant Statue", /obj/structure/statue/sandstone/assistant, 5, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("Breakdown into sand", /obj/item/weapon/ore/glass, 1, one_per_turf = 0, on_floor = 1), \
 /*	new/datum/stack_recipe("sandstone wall", ???), \
@@ -154,8 +155,9 @@ GLOBAL_LIST_INIT(plasma_recipes, list ( \

 /obj/item/stack/sheet/mineral/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(W.is_hot() > 300)//If the temperature of the object is over 300, then ignite
-		message_admins("Plasma sheets ignited by [key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
-		log_game("Plasma sheets ignited by [key_name(user)] in ([x],[y],[z])")
+		var/turf/T = get_turf(src)
+		message_admins("Plasma sheets ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(T)]",0,1)
+		log_game("Plasma sheets ignited by [key_name(user)] in [COORD(T)]")
 		fire_act()
 	else
 		return ..()
@@ -334,12 +336,20 @@ GLOBAL_LIST_INIT(snow_recipes, list ( \
 /*
 * Adamantine
 */
+GLOBAL_LIST_INIT(adamantine_recipes, list(
+	new /datum/stack_recipe("artificial golem shell", /obj/item/golem_shell/artificial, req_amount=1, res_amount=1),
+	))
+
 /obj/item/stack/sheet/mineral/adamantine
 	name = "adamantine"
 	icon_state = "sheet-adamantine"
 	singular_name = "adamantine sheet"
 	origin_tech = "materials=4"

+/obj/item/stack/sheet/mineral/adamantine/Initialize(mapload, new_amount, merge = TRUE)
+	recipes = GLOB.adamantine_recipes
+	..()
+
 /*
 * Mythril
 */
@@ -286,13 +286,16 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list ( \
 		return
 	..()

-/obj/item/stack/sheet/runed_metal/fifty
-	amount = 50
-
 /obj/item/stack/sheet/runed_metal/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.runed_metal_recipes
 	return ..()

+/obj/item/stack/sheet/runed_metal/fifty
+	amount = 50
+
+/obj/item/stack/sheet/runed_metal/five
+	amount = 5
+
 /*
 * Brass
 */
@@ -328,7 +331,7 @@ GLOBAL_LIST_INIT(brass_recipes, list ( \

 /obj/item/stack/tile/brass/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.brass_recipes
-	..()
+	. = ..()
 	pixel_x = 0
 	pixel_y = 0

@@ -13,8 +13,8 @@
 	var/turf_type = null
 	var/mineralType = null

-/obj/item/stack/tile/New(loc, amount)
-	..()
+/obj/item/stack/tile/Initialize(mapload, amount)
+	. = ..()
 	pixel_x = rand(-3, 3)
 	pixel_y = rand(-3, 3) //randomize a little

@@ -88,6 +88,14 @@
 	turf_type = /turf/open/floor/wood
 	resistance_flags = FLAMMABLE

+//Basalt
+/obj/item/stack/tile/basalt
+	name = "basalt tile"
+	singular_name = "basalt floor tile"
+	desc = "Artificially made ashy soil themed on a hostile enviroment."
+	icon_state = "tile_basalt"
+	origin_tech = "materials=1"
+	turf_type = /turf/open/floor/grass/fakebasalt

 //Carpets
 /obj/item/stack/tile/carpet
@@ -1218,9 +1218,9 @@
 	icon_state = "lawyer"
 	toysay = "My client is a dirty traitor!"

-/obj/item/toy/figure/librarian
-	name = "Librarian action figure"
-	icon_state = "librarian"
+/obj/item/toy/figure/curator
+	name = "Curator action figure"
+	icon_state = "curator"
 	toysay = "One day while..."

 /obj/item/toy/figure/md
@@ -0,0 +1,46 @@
+
+/obj/item/weapon/pie_cannon
+	name = "pie cannon"
+	desc = "Load cream pie for optimal results"
+	force = 10
+	icon_state = "piecannon"
+	item_state = "powerfist"
+	var/obj/item/weapon/reagent_containers/food/snacks/pie/loaded = null
+
+/obj/item/weapon/pie_cannon/attackby(obj/item/I, mob/living/L)
+	if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/pie))
+		if(!loaded)
+			L.transferItemToLoc(I, src)
+			loaded = I
+			to_chat(L, "<span class='notice'>You load the [I] into the [src]!</span>")
+			return
+	return ..()
+
+/obj/item/weapon/pie_cannon/afterattack(atom/target, mob/living/user, flag, params)
+	if(!loaded)
+		return ..()
+	var/obj/item/projectile/pie/launched = new /obj/item/projectile/pie(src)
+	launched.P = loaded
+	loaded.forceMove(launched)
+	launched.appearance = loaded.appearance
+	loaded = null
+	launched.preparePixelProjectile(target, get_turf(target), user, params, 0)
+	launched.forceMove(get_turf(src))
+	launched.fire()
+	user.visible_message("<span class='danger'>[user] fires the [src] at [target]!</span>")
+
+/obj/item/projectile/pie
+	name = "pie"
+	desc = "Think fast!"
+	var/obj/item/weapon/reagent_containers/food/snacks/pie/P = null
+
+/obj/item/projectile/pie/on_hit(atom/A)
+	. = ..()
+	if(P)
+		A.visible_message("<span class='danger'>[P] smashes into [A] at high velocity!</span>")
+		P.forceMove(get_turf(A))
+		P.throw_impact(A)
+		if(ismovableatom(A))
+			var/atom/movable/AM = A
+			if(!AM.anchored)
+				AM.throw_at(get_edge_target_turf(get_dir(src, AM), 3, 2))
@@ -81,7 +81,7 @@

 	to_chat(user, "<span class='notice'>You start planting the bomb...</span>")

-	if(do_after(user, 50, target = AM))
+	if(do_after(user, 50, target = AM))
 		if(!user.temporarilyRemoveItemFromInventory(src))
 			return
 		src.target = AM
@@ -158,7 +158,7 @@
 		if(lit)
 			START_PROCESSING(SSobj, src)
 			if(!warned_admins)
-				message_admins("[key_name_admin(usr)]<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A> (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[usr]'>FLW</A>) has lit a flamethrower.")
+				message_admins("[ADMIN_LOOKUPFLW(usr)] has lit a flamethrower.")
 				warned_admins = 1
 	if(href_list["amount"])
 		throw_amount = throw_amount + text2num(href_list["amount"])
@@ -19,10 +19,10 @@
 	var/threatscale = 1 // Used by advanced grenades to make them slightly more worthy.
 	var/no_splash = FALSE //If the grenade deletes even if it has no reagents to splash with. Used for slime core reactions.

-/obj/item/weapon/grenade/chem_grenade/New()
+/obj/item/weapon/grenade/chem_grenade/Initialize()
+	. = ..()
 	create_reagents(1000)
 	stage_change() // If no argument is set, it will change the stage to the current stage, useful for stock grenades that start READY.
-	..()

 /obj/item/weapon/grenade/chem_grenade/examine(mob/user)
 	display_timer = (stage == READY && !nadeassembly)	//show/hide the timer based on assembly state
@@ -36,8 +36,8 @@
 		else if(clown_check(user))
 			var/turf/bombturf = get_turf(src)
 			var/area/A = get_area(bombturf)
-			message_admins("[key_name_admin(usr)]<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A> (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[usr]'>FLW</A>) has primed a [name] for detonation at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a>.")
-			log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).")
+			message_admins("[ADMIN_LOOKUPFLW(usr)] has primed a [name] for detonation at [A.name][ADMIN_JMP(bombturf)].")
+			log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] [COORD(bombturf)].")
 			to_chat(user, "<span class='warning'>You prime the [name]! [det_time / 10] second\s!</span>")
 			playsound(user.loc, 'sound/weapons/armbomb.ogg', 60, 1)
 			active = 1
@@ -177,12 +177,12 @@
 		var/mob/last = get_mob_by_ckey(nadeassembly.fingerprintslast)
 		var/turf/T = get_turf(src)
 		var/area/A = get_area(T)
-		message_admins("grenade primed by an assembly, attached by [key_name_admin(M)]<A HREF='?_src_=holder;adminmoreinfo=\ref[M]'>(?)</A> (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[M]'>FLW</A>) and last touched by [key_name_admin(last)]<A HREF='?_src_=holder;adminmoreinfo=\ref[last]'>(?)</A> (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[last]'>FLW</A>) ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>[A.name] (JMP)</a>.")
-		log_game("grenade primed by an assembly, attached by [key_name(M)] and last touched by [key_name(last)] ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at [A.name] ([T.x], [T.y], [T.z])")
+		message_admins("grenade primed by an assembly, attached by [ADMIN_LOOKUPFLW(M)] and last touched by [ADMIN_LOOKUPFLW(last)] ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at [A.name] [ADMIN_JMP(T)]</a>.")
+		log_game("grenade primed by an assembly, attached by [key_name(M)] and last touched by [key_name(last)] ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]) at [A.name] [COORD(T)]")

 	var/turf/DT = get_turf(src)
 	var/area/DA = get_area(DT)
-	log_game("A grenade detonated at [DA.name] ([DT.x], [DT.y], [DT.z])")
+	log_game("A grenade detonated at [DA.name] [COORD(DT)]")

 	update_mob()

@@ -313,8 +313,8 @@
 	desc = "Used for emergency sealing of air breaches."
 	stage = READY

-/obj/item/weapon/grenade/chem_grenade/metalfoam/New()
-	..()
+/obj/item/weapon/grenade/chem_grenade/metalfoam/Initialize()
+	. = ..()
 	var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)

@@ -331,8 +331,8 @@
 	desc = "Used for clearing rooms of living things."
 	stage = READY

-/obj/item/weapon/grenade/chem_grenade/incendiary/New()
-	..()
+/obj/item/weapon/grenade/chem_grenade/incendiary/Initialize()
+	. = ..()
 	var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)

@@ -349,8 +349,8 @@
 	desc = "Used for purging large areas of invasive plant species. Contents under pressure. Do not directly inhale contents."
 	stage = READY

-/obj/item/weapon/grenade/chem_grenade/antiweed/New()
-	..()
+/obj/item/weapon/grenade/chem_grenade/antiweed/Initialize()
+	. = ..()
 	var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)

@@ -368,8 +368,8 @@
 	desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas."
 	stage = READY

-/obj/item/weapon/grenade/chem_grenade/cleaner/New()
-	..()
+/obj/item/weapon/grenade/chem_grenade/cleaner/Initialize()
+	. = ..()
 	var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)

@@ -386,8 +386,8 @@
 	desc = "Waffle Co.-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas."
 	stage = READY

-/obj/item/weapon/grenade/chem_grenade/ez_clean/New()
-	..()
+/obj/item/weapon/grenade/chem_grenade/ez_clean/Initialize()
+	. = ..()
 	var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src)
 	var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src)

@@ -405,8 +405,8 @@
 	desc = "Used for nonlethal riot control. Contents under pressure. Do not directly inhale contents."
 	stage = READY

-/obj/item/weapon/grenade/chem_grenade/teargas/New()
-	..()
+/obj/item/weapon/grenade/chem_grenade/teargas/Initialize()
+	. = ..()
 	var/obj/item/weapon/reagent_containers/glass/beaker/large/B1 = new(src)
 	var/obj/item/weapon/reagent_containers/glass/beaker/large/B2 = new(src)

@@ -424,8 +424,8 @@
 	desc = "Used for melting armoured opponents."
 	stage = READY

-/obj/item/weapon/grenade/chem_grenade/facid/New()
-	..()
+/obj/item/weapon/grenade/chem_grenade/facid/Initialize()
+	. = ..()
 	var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src)
 	var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src)

@@ -444,8 +444,8 @@
 	desc = "Used for wide scale painting projects."
 	stage = READY

-/obj/item/weapon/grenade/chem_grenade/colorful/New()
-	..()
+/obj/item/weapon/grenade/chem_grenade/colorful/Initialize()
+	. = ..()
 	var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)

@@ -463,8 +463,8 @@
 	stage = READY
 	var/glitter_type = "glitter"

-/obj/item/weapon/grenade/chem_grenade/glitter/New()
-	..()
+/obj/item/weapon/grenade/chem_grenade/glitter/Initialize()
+	. = ..()
 	var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
 	var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)

@@ -496,8 +496,8 @@
 	desc = "BURN!-brand foaming clf3. In a special applicator for rapid purging of wide areas."
 	stage = READY

-/obj/item/weapon/grenade/chem_grenade/clf3/New()
-	..()
+/obj/item/weapon/grenade/chem_grenade/clf3/Initialize()
+	. = ..()
 	var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src)
 	var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src)

@@ -514,8 +514,8 @@
 	desc = "Tiger Cooperative chemical foam grenade. Causes temporary irration, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin"
 	stage = READY

-/obj/item/weapon/grenade/chem_grenade/bioterrorfoam/New()
-	..()
+/obj/item/weapon/grenade/chem_grenade/bioterrorfoam/Initialize()
+	. = ..()
 	var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src)
 	var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src)

@@ -534,8 +534,8 @@
 	desc = "WARNING: GRENADE WILL RELEASE DEADLY SPORES CONTAINING ACTIVE AGENTS. SEAL SUIT AND AIRFLOW BEFORE USE."
 	stage = READY

-/obj/item/weapon/grenade/chem_grenade/tuberculosis/New()
-	..()
+/obj/item/weapon/grenade/chem_grenade/tuberculosis/Initialize()
+	. = ..()
 	var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B1 = new(src)
 	var/obj/item/weapon/reagent_containers/glass/beaker/bluespace/B2 = new(src)

@@ -96,7 +96,7 @@

 	to_chat(user, "<span class='notice'>You start planting the [src]. The timer is set to [det_time]...</span>")

-	if(do_after(user, 50, target = AM))
+	if(do_after(user, 30, target = AM))
 		if(!user.temporarilyRemoveItemFromInventory(src))
 			return
 		src.target = AM
@@ -119,8 +119,8 @@
 			qdel(src)	//How?

 /obj/item/weapon/grenade/plastic/suicide_act(mob/user)
-	message_admins("[key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) suicided with [src] at ([user.x],[user.y],[user.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)",0,1)
-	message_admins("[key_name(user)] suicided with [src] at ([user.x],[user.y],[user.z])")
+	message_admins("[ADMIN_LOOKUPFLW(user)] suicided with [src] at [ADMIN_COORDJMP(user)]",0,1)
+	log_game("[key_name(user)] suicided with [src] at [COORD(user)]")
 	user.visible_message("<span class='suicide'>[user] activates the [src] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!</span>")
 	var/message_say = "FOR NO RAISIN!"
 	if(user.mind)
@@ -165,4 +165,4 @@
 	icon_state = "plasticx40"
 	item_state = "plasticx4"
 	directional = TRUE
-	boom_sizes = list(0, 2, 5)
+	boom_sizes = list(0, 2, 5)
@@ -1,5 +1,5 @@
 /obj/item/weapon/grenade/spawnergrenade
-	desc = "It will unleash unleash an unspecified anomaly into the vicinity."
+	desc = "It will unleash an unspecified anomaly into the vicinity."
 	name = "delivery grenade"
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "delivery"
@@ -45,7 +45,7 @@
 			if(do_mob(user, C, 30) && (C.get_num_arms() >= 2 || C.get_arm_ignore()))
 				apply_cuffs(C,user)
 				to_chat(user, "<span class='notice'>You handcuff [C].</span>")
-				feedback_add_details("handcuffs","[type]")
+				SSblackbox.add_details("handcuffs","[type]")

 				add_logs(user, C, "handcuffed")
 			else
@@ -275,7 +275,7 @@
 						C.legcuffed = src
 						src.loc = C
 						C.update_inv_legcuffed()
-						feedback_add_details("handcuffs","[type]")
+						SSblackbox.add_details("handcuffs","[type]")
 			else if(isanimal(L))
 				var/mob/living/simple_animal/SA = L
 				if(SA.mob_size > MOB_SIZE_TINY)
@@ -336,7 +336,7 @@
 		C.legcuffed = src
 		src.loc = C
 		C.update_inv_legcuffed()
-		feedback_add_details("handcuffs","[type]")
+		SSblackbox.add_details("handcuffs","[type]")
 		to_chat(C, "<span class='userdanger'>\The [src] ensnares you!</span>")
 		C.Weaken(weaken)

@@ -41,7 +41,7 @@
 		..()

 /obj/item/weapon/his_grace/CtrlClick(mob/user) //you can't pull his grace
-	attack_hand(user)
+	return

 /obj/item/weapon/his_grace/examine(mob/user)
 	..()
@@ -39,7 +39,7 @@

 	SSreligion.holy_weapon_type = holy_weapon.type

-	feedback_set_details("chaplain_weapon","[choice]")
+	SSblackbox.set_details("chaplain_weapon","[choice]")

 	if(holy_weapon)
 		holy_weapon.reskinned = TRUE
@@ -214,7 +214,7 @@

 	possessed = TRUE

-	var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_POSSESSED_BLADE)
+	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the spirit of [user.real_name]'s blade?", ROLE_PAI, null, FALSE, 100, POLL_IGNORE_POSSESSED_BLADE)
 	var/mob/dead/observer/theghost = null

 	if(LAZYLEN(candidates))
@@ -44,7 +44,7 @@
 	active = TRUE
 	var/turf/boomturf = get_turf(imp_in)
 	var/area/A = get_area(boomturf)
-	message_admins("[key_name_admin(imp_in)]<A HREF='?_src_=holder;adminmoreinfo=\ref[imp_in]'>?</A> (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[imp_in]'>FLW</A>) has activated their [name] at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[imp_in.x];Y=[imp_in.y];Z=[imp_in.z]'>[A.name] (JMP)</a>.")
+	message_admins("[ADMIN_LOOKUPFLW(imp_in)] has activated their [name] at [A.name] [ADMIN_JMP(boomturf)].")
 //If the delay is short, just blow up already jeez
 	if(delay <= 7)
 		explosion(src,heavy,medium,weak,weak, flame_range = weak)
@@ -41,9 +41,10 @@
 	data["open"] = state_open

 	data["occupant"] = list()
-	if(occupant)
-		data["occupant"]["name"] = occupant.name
-		data["occupant"]["stat"] = occupant.stat
+	if(occupant)
+		var/mob/living/mob_occupant = occupant
+		data["occupant"]["name"] = mob_occupant.name
+		data["occupant"]["stat"] = mob_occupant.stat

 	data["special_name"] = special ? special_name : null
 	data["ready_implants"]  = ready_implants
@@ -16,7 +16,7 @@
 	var/brightness_on = 3

 /obj/item/weapon/melee/energy/Initialize()
-	..()
+	. = ..()
 	if(LAZYLEN(possible_colors))
 		item_color = pick(possible_colors)
 		switch(item_color)//Only run this check if the color was picked randomly, so that colors can be manually set for non-random colored energy weapons.
@@ -183,8 +183,8 @@
 	light_color = "#40ceff"
 	possible_colors = null

-/obj/item/weapon/melee/energy/sword/cyborg/saw/New()
-	..()
+/obj/item/weapon/melee/energy/sword/cyborg/saw/Initialize()
+	. = ..()
 	icon_state = "esaw_0"
 	item_color = null

@@ -207,19 +207,9 @@


 /obj/item/weapon/melee/energy/sword/saber/attackby(obj/item/weapon/W, mob/living/user, params)
-	if(istype(W, /obj/item/weapon/melee/energy/sword/saber))
-		to_chat(user, "<span class='notice'>You attach the ends of the two energy swords, making a single double-bladed weapon! You're cool.</span>")
-		var/obj/item/weapon/melee/energy/sword/saber/other_esword = W
-		var/obj/item/weapon/twohanded/dualsaber/newSaber = new(user.loc)
-		if(hacked || other_esword.hacked)
-			newSaber.hacked = TRUE
-			newSaber.item_color = "rainbow"
-		qdel(W)
-		qdel(src)
-		user.put_in_hands(newSaber)
-	else if(istype(W, /obj/item/device/multitool))
-		if(hacked == 0)
-			hacked = 1
+	if(istype(W, /obj/item/device/multitool))
+		if(!hacked)
+			hacked = TRUE
 			item_color = "rainbow"
 			to_chat(user, "<span class='warning'>RNBW_ENGAGE</span>")

@@ -253,14 +243,12 @@
 	sharpness = IS_SHARP

 //Most of the other special functions are handled in their own files. aka special snowflake code so kewl
-/obj/item/weapon/melee/energy/blade/New()
+/obj/item/weapon/melee/energy/blade/Initialize()
+	. = ..()
 	spark_system = new /datum/effect_system/spark_spread()
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)

-/obj/item/weapon/melee/energy/blade/dropped()
-	..()
-
 /obj/item/weapon/melee/energy/blade/attack_self(mob/user)
 	return

@@ -1,3 +1,7 @@
+
+#define PCANNON_FIREALL 1
+#define PCANNON_FILO 2
+#define PCANNON_FIFO 3
 /obj/item/weapon/pneumatic_cannon
 	name = "pneumatic cannon"
 	desc = "A gas-powered cannon that can fire any object loaded into it."
@@ -16,7 +20,15 @@
 	var/gasPerThrow = 3 //How much gas is drawn from a tank's pressure to fire
 	var/list/loadedItems = list() //The items loaded into the cannon that will be fired out
 	var/pressureSetting = 1 //How powerful the cannon is - higher pressure = more gas but more powerful throws
+	var/checktank = TRUE
+	var/range_multiplier = 1
+	var/throw_amount = 20	//How many items to throw per fire
+	var/fire_mode = PCANNON_FIREALL
+	var/automatic = FALSE
+	var/clumsyCheck = TRUE

+/obj/item/weapon/pneumatic_cannon/CanItemAutoclick()
+	return automatic

 /obj/item/weapon/pneumatic_cannon/examine(mob/user)
 	..()
@@ -30,6 +42,8 @@


 /obj/item/weapon/pneumatic_cannon/attackby(obj/item/weapon/W, mob/user, params)
+	if(user.a_intent == INTENT_HARM)
+		return ..()
 	if(istype(W, /obj/item/weapon/tank/internals))
 		if(!tank)
 			var/obj/item/weapon/tank/internals/IT = W
@@ -55,19 +69,31 @@
 		to_chat(user, "<span class='warning'>\The [src] can't hold any more items!</span>")
 	else if(istype(W, /obj/item))
 		var/obj/item/IW = W
-		if((loadedWeightClass + IW.w_class) > maxWeightClass)
-			to_chat(user, "<span class='warning'>\The [IW] won't fit into \the [src]!</span>")
-			return
-		if(IW.w_class > src.w_class)
-			to_chat(user, "<span class='warning'>\The [IW] is too large to fit into \the [src]!</span>")
-			return
-		if(!user.transferItemToLoc(W, src))
-			return
-		to_chat(user, "<span class='notice'>You load \the [IW] into \the [src].</span>")
-		loadedItems.Add(IW)
-		loadedWeightClass += IW.w_class
+		load_item(IW, user)

+/obj/item/weapon/pneumatic_cannon/proc/can_load_item(obj/item/I, mob/user)
+	if((loadedWeightClass + I.w_class) > maxWeightClass)	//Only make messages if there's a user
+		if(user)
+			to_chat(user, "<span class='warning'>\The [I] won't fit into \the [src]!</span>")
+		return FALSE
+	if(I.w_class > w_class)
+		if(user)
+			to_chat(user, "<span class='warning'>\The [I] is too large to fit into \the [src]!</span>")
+		return FALSE
+	return TRUE

+/obj/item/weapon/pneumatic_cannon/proc/load_item(obj/item/I, mob/user)
+	if(!can_load_item(I, user))
+		return FALSE
+	if(user)		//Only use transfer proc if there's a user, otherwise just set loc.
+		if(!user.transferItemToLoc(I, src))
+			return FALSE
+		to_chat(user, "<span class='notice'>You load \the [I] into \the [src].</span>")
+	else
+		I.forceMove(src)
+	loadedItems += I
+	loadedWeightClass += I.w_class
+	return TRUE

 /obj/item/weapon/pneumatic_cannon/afterattack(atom/target, mob/living/carbon/human/user, flag, params)
 	if(flag && user.a_intent == INTENT_HARM) //melee attack
@@ -76,7 +102,6 @@
 		return
 	Fire(user, target)

-
 /obj/item/weapon/pneumatic_cannon/proc/Fire(mob/living/carbon/human/user, var/atom/target)
 	if(!istype(user) && !target)
 		return
@@ -90,13 +115,13 @@
 	if(!loadedItems || !loadedWeightClass)
 		to_chat(user, "<span class='warning'>\The [src] has nothing loaded.</span>")
 		return
-	if(!tank)
+	if(!tank && checktank)
 		to_chat(user, "<span class='warning'>\The [src] can't fire without a source of gas.</span>")
 		return
 	if(tank && !tank.air_contents.remove(gasPerThrow * pressureSetting))
 		to_chat(user, "<span class='warning'>\The [src] lets out a weak hiss and doesn't react!</span>")
 		return
-	if(user.disabilities & CLUMSY && prob(75))
+	if(user.disabilities & CLUMSY && prob(75) && clumsyCheck)
 		user.visible_message("<span class='warning'>[user] loses their grip on [src], causing it to go off!</span>", "<span class='userdanger'>[src] slips out of your hands and goes off!</span>")
 		user.drop_item()
 		if(prob(10))
@@ -109,17 +134,48 @@
 		user.visible_message("<span class='danger'>[user] fires \the [src]!</span>", \
 				    		 "<span class='danger'>You fire \the [src]!</span>")
 	add_logs(user, target, "fired at", src)
+	var/turf/T = get_target(target, get_turf(src))
 	playsound(src.loc, 'sound/weapons/sonic_jackhammer.ogg', 50, 1)
-	for(var/obj/item/ITD in loadedItems) //Item To Discharge
-		loadedItems.Remove(ITD)
-		loadedWeightClass -= ITD.w_class
-		ITD.throw_speed = pressureSetting * 2
-		ITD.loc = get_turf(src)
-		ITD.throw_at(target, pressureSetting * 5, pressureSetting * 2,user)
+	fire_items(T, user)
 	if(pressureSetting >= 3 && user)
 		user.visible_message("<span class='warning'>[user] is thrown down by the force of the cannon!</span>", "<span class='userdanger'>[src] slams into your shoulder, knocking you down!")
 		user.Weaken(3)

+/obj/item/weapon/pneumatic_cannon/proc/fire_items(turf/target, mob/user)
+	if(fire_mode == PCANNON_FIREALL)
+		for(var/obj/item/ITD in loadedItems) //Item To Discharge
+			if(!throw_item(target, ITD, user))
+				break
+	else
+		for(var/i in 1 to throw_amount)
+			if(!loadedItems.len)
+				break
+			var/obj/item/I
+			if(fire_mode == PCANNON_FILO)
+				I = loadedItems[loadedItems.len]
+			else
+				I = loadedItems[1]
+			if(!throw_item(target, I, user))
+				break
+
+/obj/item/weapon/pneumatic_cannon/proc/throw_item(turf/target, obj/item/I, mob/user)
+	if(!istype(I))
+		return FALSE
+	loadedItems -= I
+	loadedWeightClass -= I.w_class
+	I.forceMove(get_turf(src))
+	I.throw_at(target, pressureSetting * 10 * range_multiplier, pressureSetting * 2, user)
+	return TRUE
+
+/obj/item/weapon/pneumatic_cannon/proc/get_target(turf/target, turf/starting)
+	if(range_multiplier == 1)
+		return target
+	var/x_o = (target.x - starting.x)
+	var/y_o = (target.y - starting.y)
+	var/new_x = Clamp((starting.x + (x_o * range_multiplier)), 0, world.maxx)
+	var/new_y = Clamp((starting.y + (y_o * range_multiplier)), 0, world.maxy)
+	var/turf/newtarget = locate(new_x, new_y, starting.z)
+	return newtarget

 /obj/item/weapon/pneumatic_cannon/ghetto //Obtainable by improvised methods; more gas per use, less capacity, but smaller
 	name = "improvised pneumatic cannon"
@@ -164,3 +220,35 @@
 		return
 	add_overlay(tank.icon_state)
 	src.update_icon()
+
+/obj/item/weapon/pneumatic_cannon/proc/fill_with_type(type, amount)
+	if(!ispath(type, /obj/item))
+		return FALSE
+	var/loaded = 0
+	for(var/i in 1 to amount)
+		var/obj/item/I = new type
+		if(!load_item(I, null))
+			qdel(I)
+			return loaded
+		loaded++
+		CHECK_TICK
+	return loaded
+
+/obj/item/weapon/pneumatic_cannon/pie
+	name = "pie cannon"
+	desc = "Load cream pie for optimal results"
+	force = 10
+	icon_state = "piecannon"
+	gasPerThrow = 0
+	checktank = FALSE
+	range_multiplier = 3
+	fire_mode = PCANNON_FIFO
+	throw_amount = 1
+	maxWeightClass = 100	//50 pies. :^)
+	clumsyCheck = FALSE
+
+/obj/item/weapon/pneumatic_cannon/pie/can_load_item(obj/item/I, mob/user)
+	if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/pie))
+		return ..()
+	to_chat(user, "<span class='warning'>[src] only accepts pies!</span>")
+	return FALSE
@@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
 		SSreligion.bible_icon_state = B.icon_state
 		SSreligion.bible_item_state = B.item_state

-		feedback_set_details("religion_book","[biblename]")
+		SSblackbox.set_details("religion_book","[biblename]")
 		usr << browse(null, "window=editicon")

 /obj/item/weapon/storage/book/bible/proc/bless(mob/living/carbon/human/H, mob/living/user)
@@ -0,0 +1,48 @@
+//////////////////////////////////
+//dakimakuras
+//////////////////////////////////
+
+/obj/item/weapon/storage/daki
+	name = "dakimakura" 
+	desc = "A large pillow depicting a girl in a compromising position. Featuring as many dimensions as you."
+	icon = 'icons/obj/daki.dmi'
+	icon_state = "daki_base"
+	slot_flags = SLOT_BACK
+	storage_slots = 3
+	w_class = 4
+	max_w_class = 3
+	max_combined_w_class = 21
+	var/cooldowntime = 20
+	var/static/list/dakimakura_options = list("Callie","Casca","Chaika","Elisabeth","Foxy Grandpa","Haruko","Holo","Ian","Jolyne","Kurisu","Marie","Mugi","Nar'Sie","Patchouli","Plutia","Rei","Reisen","Naga","Squid","Squigly","Tomoko","Toriel","Umaru","Yaranaika","Yoko") //Kurisu is the ideal girl." - Me, Logos.
+
+/obj/item/weapon/storage/daki/attack_self(mob/living/user)
+	var/body_choice
+	var/custom_name
+	
+	if(icon_state == "daki_base")
+		body_choice = input("Pick a body.") in dakimakura_options
+		icon_state = "daki_[body_choice]"
+		custom_name = stripped_input(user, "What's her name?")
+		if(length(custom_name) > MAX_NAME_LEN)
+			to_chat(user,"<span class='danger'>Name is too long!</span>")
+			return FALSE
+		if(custom_name)
+			name = custom_name
+			desc = "A large pillow depicting [custom_name] in a compromising position. Featuring as many dimensions as you."
+	else
+		switch(user.a_intent)
+			if(INTENT_HELP)
+				user.visible_message("<span class='notice'>[user] hugs the [name].</span>")
+				playsound(src, "rustle", 50, 1, -5)
+			if(INTENT_DISARM)
+				user.visible_message("<span class='notice'>[user] kisses the [name].</span>")
+				playsound(src, "rustle", 50, 1, -5)
+			if(INTENT_GRAB)
+				user.visible_message("<span class='warning'>[user] holds the [name]!</span>")
+				playsound(src, 'sound/items/bikehorn.ogg', 50, 1)
+			if(INTENT_HARM)
+				user.visible_message("<span class='danger'>[user] punches the [name]!</span>")
+				playsound(src, 'sound/effects/shieldbash.ogg', 50, 1)
+		user.changeNext_move(CLICK_CD_MELEE)
+
+////////////////////////////
@@ -5,10 +5,6 @@
 	w_class = WEIGHT_CLASS_BULKY
 	rustle_jimmies = FALSE

-/obj/item/weapon/storage/internal/ClickAccessible(mob/user, depth=1)
-	if(loc)
-		return loc.ClickAccessible(user, depth)
-
 /obj/item/weapon/storage/internal/Adjacent(A)
 	if(loc)
 		return loc.Adjacent(A)
@@ -53,7 +49,7 @@
 		/obj/item/weapon/implanter, /obj/item/weapon/screwdriver, /obj/item/weapon/weldingtool/mini,
 		/obj/item/device/firing_pin
 		)
-	//can hold both regular pens and energy daggers. made for your every-day tactical librarians/murderers.
+	//can hold both regular pens and energy daggers. made for your every-day tactical curators/murderers.
 	priority = FALSE
 	quickdraw = TRUE
 	silent = TRUE
@@ -38,7 +38,7 @@
 			return

 		// this must come before the screen objects only block, dunno why it wasn't before
-		if(over_object == M && (src.ClickAccessible(M, depth=STORAGE_VIEW_DEPTH) || Adjacent(M)))
+		if(over_object == M && M.CanReach(src,view_only = TRUE))
 			orient2hud(M)
 			if(M.s_active)
 				M.s_active.close(M)
@@ -92,8 +92,7 @@
 			new /obj/item/pizzabox/bomb

 		if("darklord") //20 tc + tk + summon item close enough for now
-			new /obj/item/weapon/melee/energy/sword/saber(src)
-			new /obj/item/weapon/melee/energy/sword/saber(src)
+			new /obj/item/weapon/twohanded/dualsaber(src)
 			new /obj/item/weapon/dnainjector/telemut/darkbundle(src)
 			new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
 			new /obj/item/weapon/card/id/syndicate(src)
@@ -220,6 +219,7 @@
 	new /obj/item/weapon/reagent_containers/glass/bottle/venom(src)
 	new /obj/item/weapon/reagent_containers/glass/bottle/neurotoxin2(src)
 	new /obj/item/weapon/reagent_containers/glass/bottle/formaldehyde(src)
+	new /obj/item/weapon/reagent_containers/glass/bottle/spewium(src)
 	new /obj/item/weapon/reagent_containers/glass/bottle/cyanide(src)
 	new /obj/item/weapon/reagent_containers/glass/bottle/histamine(src)
 	new /obj/item/weapon/reagent_containers/glass/bottle/initropidril(src)
@@ -296,3 +296,10 @@
 /obj/item/weapon/storage/box/syndie_kit/mimery/PopulateContents()
 	new /obj/item/weapon/spellbook/oneuse/mimery_blockade(src)
 	new /obj/item/weapon/spellbook/oneuse/mimery_guns(src)
+
+/obj/item/weapon/storage/box/syndie_kit/holoparasite
+	name = "box"
+
+/obj/item/weapon/storage/box/syndie_kit/holoparasite/PopulateContents()
+	new /obj/item/weapon/guardiancreator/tech/choose/traitor(src)
+	new /obj/item/weapon/paper/guardian(src)
@@ -116,7 +116,7 @@
 	var/mob/living/carbon/human/H = user
 	user.visible_message("<span class='suicide'>[user] is putting [src]'s valve to [user.p_their()] lips! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	playsound(loc, 'sound/effects/spray.ogg', 10, 1, -3)
-	if (H && !QDELETED(H))
+	if (!QDELETED(H) && air_contents && air_contents.return_pressure() >= 1000)
 		for(var/obj/item/W in H)
 			H.dropItemToGround(W)
 			if(prob(50))
@@ -262,11 +262,11 @@
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70)
 	resistance_flags = FIRE_PROOF
 	var/hacked = 0
-	var/brightness_on = 6//TWICE AS BRIGHT AS A REGULAR ESWORD
+	var/brightness_on = 6 //TWICE AS BRIGHT AS A REGULAR ESWORD
 	var/list/possible_colors = list("red", "blue", "green", "purple")

 /obj/item/weapon/twohanded/dualsaber/Initialize()
-	..()
+	. = ..()
 	if(LAZYLEN(possible_colors))
 		item_color = pick(possible_colors)
 		switch(item_color)
@@ -71,3 +71,9 @@
 	icon_state = "refill_clothes"
 	charges = list(31, 4, 4)// of 101 standard, 12 contraband, 10 premium(?)
 	init_charges = list(31, 4, 4)
+
+/obj/item/weapon/vending_refill/medical
+	machine_name = "NanoMed"
+	icon_state = "refill_medical"
+	charges = list(26, 5, 3)// of 76 standard, 13 contraband, 8 premium
+	init_charges = list(26, 5, 3)
@@ -390,7 +390,7 @@
 	desc = "A chainsaw that has replaced your arm."
 	icon_state = "chainsaw_on"
 	item_state = "mounted_chainsaw"
-	flags = NODROP | ABSTRACT
+	flags = NODROP | ABSTRACT | DROPDEL
 	w_class = WEIGHT_CLASS_HUGE
 	force = 21
 	throwforce = 0
@@ -400,10 +400,17 @@
 	attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
 	hitsound = 'sound/weapons/chainsawhit.ogg'

-/obj/item/weapon/mounted_chainsaw/dropped()
-	..()
+/obj/item/weapon/mounted_chainsaw/Destroy()
+	var/obj/item/bodypart/part
 	new /obj/item/weapon/twohanded/required/chainsaw(get_turf(src))
-	qdel(src)
+	if(iscarbon(loc))
+		var/mob/living/carbon/holder = loc
+		var/index = holder.get_held_index_of_item(src)
+		if(index)
+			part = holder.hand_bodyparts[index]
+	. = ..()
+	if(part)
+		part.drop_limb()

 /obj/item/weapon/statuebust
 	name = "bust"
@@ -23,7 +23,7 @@

 	var/persistence_replacement //have something WAY too amazing to live to the next round? Set a new path here. Overuse of this var will make me upset.
 	var/unique_rename = FALSE // can you customize the description/name of the thing?
-	
+
 	var/dangerous_possession = FALSE	//Admin possession yes/no

 /obj/vv_edit_var(vname, vval)
@@ -180,7 +180,7 @@
 						var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(loc, laws, brain.brainmob)
 						if(brain.force_replace_ai_name)
 							A.fully_replace_character_name(A.name, brain.replacement_ai_name())
-						feedback_inc("cyborg_ais_created",1)
+						SSblackbox.inc("cyborg_ais_created",1)
 						qdel(src)
 					else
 						state = AI_READY_CORE
@@ -298,7 +298,7 @@
 			else
 				for(var/mob/M in range(1,src))
 					if(CanHug(M))
-						child.Attach(M)
+						child.Leap(M)
 						break

 /obj/structure/alien/egg/obj_break(damage_flag)
@@ -106,6 +106,11 @@ LINEN BINS
 	icon_state = "sheetrd"
 	item_color = "director"

+// for Free Golems.
+/obj/item/weapon/bedsheet/rd/royal_cape
+	name = "Royal Cape of the Liberator"
+	desc = "Majestic."
+
 /obj/item/weapon/bedsheet/medical
 	name = "medical blanket"
 	desc = "It's a sterilized* blanket commonly used in the Medbay.  *Sterilization is voided if a virologist is present onboard the station."
@@ -11,6 +11,7 @@
 	else
 		new /obj/item/weapon/storage/backpack/satchel/cap(src)
 	new /obj/item/clothing/neck/cloak/cap(src)
+	new /obj/item/weapon/storage/daki(src) 
 	new /obj/item/weapon/storage/backpack/dufflebag/captain(src)
 	new /obj/item/clothing/head/crown/fancy(src)
 	new /obj/item/clothing/suit/captunic(src)
@@ -11,32 +11,31 @@
 	max_integrity = 200
 	integrity_failure = 50
 	var/obj/item/showpiece = null
-	var/alert = 0
-	var/open = 0
+	var/alert = TRUE
+	var/open = FALSE
+	var/openable = TRUE
 	var/obj/item/weapon/electronics/airlock/electronics
 	var/start_showpiece_type = null //add type for items on display

-/obj/structure/displaycase/New()
-	..()
+/obj/structure/displaycase/Initialize()
+	. = ..()
 	if(start_showpiece_type)
 		showpiece = new start_showpiece_type (src)
 	update_icon()

 /obj/structure/displaycase/Destroy()
 	if(electronics)
-		qdel(electronics)
-		electronics = null
+		QDEL_NULL(electronics)
 	if(showpiece)
-		qdel(showpiece)
-		showpiece = null
+		QDEL_NULL(showpiece)
 	return ..()

 /obj/structure/displaycase/examine(mob/user)
 	..()
-	if(showpiece)
-		to_chat(user, "<span class='notice'>There's [showpiece] inside.</span>")
 	if(alert)
 		to_chat(user, "<span class='notice'>Hooked up with an anti-theft system.</span>")
+	if(showpiece)
+		to_chat(user, "<span class='notice'>There's [showpiece] inside.</span>")


 /obj/structure/displaycase/proc/dump()
@@ -83,8 +82,8 @@
 	try
 		getFlatIcon(A,defdir=4)
 	catch
-		return 0
-	return 1
+		return FALSE
+	return TRUE

 /obj/structure/displaycase/proc/get_flat_icon_directional(atom/A)
 	//Get flatIcon even if dir is mismatched for directionless icons
@@ -115,7 +114,7 @@
 	return

 /obj/structure/displaycase/attackby(obj/item/weapon/W, mob/user, params)
-	if(W.GetID() && !broken)
+	if(W.GetID() && !broken && openable)
 		if(allowed(user))
 			to_chat(user,  "<span class='notice'>You [open ? "close":"open"] the [src]</span>")
 			toggle_lock(user)
@@ -134,7 +133,7 @@
 		else
 			to_chat(user, "<span class='warning'>[src] is already in good condition!</span>")
 		return
-	else if(!alert && istype(W,/obj/item/weapon/crowbar)) //Only applies to the lab cage and player made display cases
+	else if(!alert && istype(W,/obj/item/weapon/crowbar) && openable) //Only applies to the lab cage and player made display cases
 		if(broken)
 			if(showpiece)
 				to_chat(user, "<span class='notice'>Remove the displayed object first.</span>")
@@ -147,8 +146,7 @@
 				to_chat(user,  "<span class='notice'>You [open ? "close":"open"] the [src]</span>")
 				toggle_lock(user)
 	else if(open && !showpiece)
-		if(user.drop_item())
-			W.loc = src
+		if(user.transferItemToLoc(W, src))
 			showpiece = W
 			to_chat(user, "<span class='notice'>You put [W] on display</span>")
 			update_icon()
@@ -176,8 +174,8 @@
 /obj/structure/displaycase/attack_hand(mob/user)
 	user.changeNext_move(CLICK_CD_MELEE)
 	if (showpiece && (broken || open))
-		dump()
 		to_chat(user, "<span class='notice'>You deactivate the hover field built into the case.</span>")
+		dump()
 		src.add_fingerprint(user)
 		update_icon()
 		return
@@ -249,3 +247,115 @@
 	desc = "A glass lab container for storing interesting creatures."
 	start_showpiece_type = /obj/item/clothing/mask/facehugger/lamarr
 	req_access = list(GLOB.access_rd)
+
+/obj/structure/displaycase/trophy
+	name = "trophy display case"
+	desc = "Store your trophies of accomplishment in here, and they will stay forever."
+	var/trophy_message = ""
+	var/placer_key = ""
+	var/added_roundstart = TRUE
+	var/is_locked = TRUE
+
+	alert = TRUE
+	integrity_failure = 0
+	openable = FALSE
+
+/obj/structure/displaycase/trophy/Initialize()
+	. = ..()
+	GLOB.trophy_cases += src
+
+/obj/structure/displaycase/trophy/Destroy()
+	GLOB.trophy_cases -= src
+	return ..()
+
+/obj/structure/displaycase/trophy/examine(mob/user)
+	..()
+	if(trophy_message)
+		to_chat(user, "The plaque reads:")
+		to_chat(user, trophy_message)
+
+/obj/structure/displaycase/trophy/attackby(obj/item/weapon/W, mob/user, params)
+
+	if(!user.Adjacent(src)) //no TK museology
+		return
+	if(user.a_intent == INTENT_HARM)
+		return ..()
+
+	if(user.is_holding_item_of_type(/obj/item/key/displaycase))
+		if(added_roundstart)
+			is_locked = !is_locked
+			to_chat(user, "You [!is_locked ? "un" : ""]lock the case.")
+		else
+			to_chat(user, "<span class='danger'>The lock is stuck shut!</span>")
+		return
+
+	if(is_locked)
+		to_chat(user, "<span class='danger'>The case is shut tight with an old fashioned physical lock. Maybe you should ask the curator for the key?</span>")
+		return
+
+	if(!added_roundstart)
+		to_chat(user, "You've already put something new in this case.")
+		return
+
+	if(is_type_in_typecache(W, GLOB.blacklisted_cargo_types))
+		to_chat(user, "<span class='danger'>The case rejects the [W].</span>")
+		return
+
+	for(var/a in W.GetAllContents())
+		if(is_type_in_typecache(a, GLOB.blacklisted_cargo_types))
+			to_chat(user, "<span class='danger'>The case rejects the [W].</span>")
+			return
+
+	if(user.transferItemToLoc(W, src))
+
+		if(showpiece)
+			to_chat(user, "You press a button, and [showpiece] descends into the floor of the case.")
+			QDEL_NULL(showpiece)
+
+		to_chat(user, "You insert [W] into the case.")
+		showpiece = W
+		added_roundstart = FALSE
+		update_icon()
+
+		placer_key = user.ckey
+
+		trophy_message = W.desc //default value
+
+		var/chosen_plaque = stripped_input(user, "What would you like the plaque to say? Default value is item's description.", "Trophy Plaque")
+		if(chosen_plaque)
+			if(user.Adjacent(src))
+				trophy_message = chosen_plaque
+				to_chat(user, "You set the plaque's text.")
+			else
+				to_chat(user, "You are too far to set the plaque's text.")
+
+		SSpersistence.SaveTrophy(src)
+		return TRUE
+
+	else
+		to_chat(user, "<span class='warning'>\The [W] is stuck to your hand, you can't put it in the [src.name]!</span>")
+
+	return
+
+/obj/structure/displaycase/trophy/dump()
+	if (showpiece)
+		if(added_roundstart)
+			visible_message("<span class='danger'>The [showpiece] crumbles to dust!</span>")
+			new /obj/effect/decal/cleanable/ash(loc)
+			QDEL_NULL(showpiece)
+		else
+			..()
+
+/obj/item/key/displaycase
+	name = "display case key"
+	desc = "The key to the curator's display cases."
+
+/obj/item/showpiece_dummy
+	name = "Cheap replica"
+
+/obj/item/showpiece_dummy/Initialize(mapload, path)
+	. = ..()
+	var/obj/item/I = path
+	name = initial(I.name)
+	icon = initial(I.icon)
+	icon_state = initial(I.icon_state)
@@ -234,8 +234,9 @@

 /obj/structure/falsewall/plasma/attackby(obj/item/weapon/W, mob/user, params)
 	if(W.is_hot() > 300)
-		message_admins("Plasma falsewall ignited by [key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
-		log_game("Plasma falsewall ignited by [key_name(user)] in ([x],[y],[z])")
+		var/turf/T = get_turf(src)
+		message_admins("Plasma falsewall ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(T)]",0,1)
+		log_game("Plasma falsewall ignited by [key_name(user)] in [COORD(T)]")
 		burnbabyburn()
 	else
 		return ..()
@@ -88,7 +88,7 @@
 	pixel_y = -20

 /obj/structure/flora/tree/jungle/Initialize()
-	icon_state = "[icon_state][rand(1, 3)]"
+	icon_state = "[icon_state][rand(1, 6)]"
 	..()

 //grass
@@ -101,6 +101,7 @@
 	death = FALSE
 	anchored = 0
 	density = 0
+	var/can_transfer = TRUE //if golems can switch bodies to this new shell
 	var/mob/living/owner = null //golem's owner if it has one
 	flavour_text = "<font size=3><b>Y</b></font><b>ou are a Free Golem. Your family worships <span class='danger'>The Liberator</span>. In his infinite and divine wisdom, he set your clan free to \
 	travel the stars with a single declaration: \"Yeah go do whatever.\" Though you are bound to the one who created you, it is customary in your society to repeat those same words to newborn \
@@ -119,7 +120,7 @@
 		Serve [creator], and assist [creator.p_them()] in completing [creator.p_their()] goals at any cost."
 		owner = creator

-/obj/effect/mob_spawn/human/golem/special(mob/living/new_spawn)
+/obj/effect/mob_spawn/human/golem/special(mob/living/new_spawn, name)
 	var/datum/species/golem/X = mob_species
 	to_chat(new_spawn, "[initial(X.info_text)]")
 	if(!owner)
@@ -132,14 +133,29 @@
 	if(ishuman(new_spawn))
 		var/mob/living/carbon/human/H = new_spawn
 		H.set_cloned_appearance()
-		H.real_name = H.dna.species.random_name()
+		if(!name)
+			H.real_name = H.dna.species.random_name()
+		else
+			H.real_name = name
+
+/obj/effect/mob_spawn/human/golem/attack_hand(mob/user)
+	if(isgolem(user) && can_transfer)
+		var/transfer = alert("Transfer your soul to [src]? (Warning, your old body will die!)",,"Yes","No")
+		if(!transfer)
+			return
+		log_game("[user.ckey] golem-swapped into [src]")
+		user.visible_message("<span class='notice'>A faint light leaves [user], moving to [src] and animating it!</span>","<span class='notice'>You leave your old body behind, and transfer into [src]!</span>")
+		create(ckey = user.ckey, flavour = FALSE, name = user.real_name)
+		user.death()
+		return
+	..()
+

 /obj/effect/mob_spawn/human/golem/adamantine
 	name = "dust-caked golem shell"
 	desc = "A humanoid shape, empty, lifeless, and full of potential."
 	mob_name = "a free golem"
-	anchored = 1
-	density = 1
+	can_transfer = FALSE
 	mob_species = /datum/species/golem/adamantine

 //Malfunctioning cryostasis sleepers: Spawns in makeshift shelters in lavaland. Ghosts become hermits with knowledge of how they got to where they are now.
@@ -188,8 +188,9 @@

 /obj/structure/mineral_door/transparent/plasma/attackby(obj/item/weapon/W, mob/user, params)
 	if(W.is_hot())
-		message_admins("Plasma mineral door ignited by [key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
-		log_game("Plasma mineral door ignited by [key_name(user)] in ([x],[y],[z])")
+		var/turf/T = get_turf(src)
+		message_admins("Plasma mineral door ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(T)]",0,1)
+		log_game("Plasma mineral door ignited by [key_name(user)] in [COORD(T)]")
 		TemperatureAct()
 	else
 		return ..()
@@ -163,18 +163,20 @@
 		PlasmaBurn(500)
 		burn = TRUE
 	if(burn)
+		var/turf/T = get_turf(src)
 		if(Proj.firer)
-			message_admins("Plasma statue ignited by [key_name_admin(Proj.firer)](<A HREF='?_src_=holder;adminmoreinfo=\ref[Proj.firer]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[Proj.firer]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
-			log_game("Plasma statue ignited by [key_name(Proj.firer)] in ([x],[y],[z])")
+			message_admins("Plasma statue ignited by [ADMIN_LOOKUPFLW(Proj.firer)] in [ADMIN_COORDJMP(T)]",0,1)
+			log_game("Plasma statue ignited by [key_name(Proj.firer)] in [COORD(T)]")
 		else
-			message_admins("Plasma statue ignited by [Proj]. No known firer.(<A HREF='?_src_=holder;adminmoreinfo=\ref[Proj.firer]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[Proj.firer]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
-			log_game("Plasma statue ignited by [Proj] in ([x],[y],[z]). No known firer.")
+			message_admins("Plasma statue ignited by [Proj]. No known firer, in [ADMIN_COORDJMP(T)]",0,1)
+			log_game("Plasma statue ignited by [Proj] in [COORD(T)]. No known firer.")
 	..()

 /obj/structure/statue/plasma/attackby(obj/item/weapon/W, mob/user, params)
 	if(W.is_hot() > 300)//If the temperature of the object is over 300, then ignite
-		message_admins("Plasma statue ignited by [key_name_admin(user)](<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
-		log_game("Plasma statue ignited by [key_name(user)] in ([x],[y],[z])")
+		var/turf/T = get_turf(src)
+		message_admins("Plasma statue ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_COORDJMP(T)]",0,1)
+		log_game("Plasma statue ignited by [key_name(user)] in [COORD(T)]")
 		ignite(W.is_hot())
 	else
 		return ..()
@@ -8,8 +8,10 @@
 	alpha = 30 //initially quite hidden when not "recharging"
 	var/last_trigger = 0
 	var/time_between_triggers = 600 //takes a minute to recharge
+	var/charges = INFINITY

 	var/list/static/ignore_typecache
+	var/list/mob/immune_minds = list()

 	var/datum/effect_system/spark_spread/spark_system

@@ -30,9 +32,11 @@
 	. = ..()

 /obj/structure/trap/examine(mob/user)
-	..()
+	. = ..()
 	if(!isliving(user))
 		return
+	if(user.mind && user.mind in immune_minds)
+		return
 	if(get_dist(user, src) <= 1)
 		to_chat(user, "<span class='notice'>You reveal [src]!</span>")
 		flare()
@@ -41,10 +45,15 @@
 	// Makes the trap visible, and starts the cooldown until it's
 	// able to be triggered again.
 	visible_message("<span class='warning'>[src] flares brightly!</span>")
-	alpha = 200
-	animate(src, alpha = initial(alpha), time = time_between_triggers)
-	last_trigger = world.time
 	spark_system.start()
+	alpha = 200
+	last_trigger = world.time
+	charges--
+	if(charges <= 0)
+		animate(src, alpha = 0, time = 10)
+		QDEL_IN(src, 10)
+	else
+		animate(src, alpha = initial(alpha), time = time_between_triggers)

 /obj/structure/trap/Crossed(atom/movable/AM)
 	if(last_trigger + time_between_triggers > world.time)
@@ -52,6 +61,12 @@
 	// Don't want the traps triggered by sparks, ghosts or projectiles.
 	if(is_type_in_typecache(AM, ignore_typecache))
 		return
+	if(ismob(AM))
+		var/mob/M = AM
+		if(M.mind in immune_minds)
+			return
+	if(charges <= 0)
+		return
 	flare()
 	if(isliving(AM))
 		trap_effect(AM)