Master to ai electric boogaloo (#5682)

* Ports the supermatter grenade, supporting code * May or may not make movement seem smoother * Fixes the Sleepy Ring * Partially ports the GLOB system * Fixes the bug(s) that allow meat bodies to have metal brains * ports VOREStation/VOREStation#4165 - i forgot to check if advanced who was a thing here * Optimizes supply UI * Transfer shuttle grammar fixes * Fixes borked E and W fish sprites * Fixes incorrect ETA in crew transfer announcement * Ports descriptors from Bay * Add files via upload * Removes Noble Defines * Mech Mini 'Revamp'. Will need playtesting. (#5480) * Exosuits are now capable of holding more equipment, of specific types. * Tweaks regarding feedback in staffside thread, other concerns. * Tweak to be more consistent. Why did the Odysseus have two universals. Tweak to weapon restriction on Med - > Odyss * Weapons only fit in universal combat slots. * Adds smart magazine, magazine functionality * Adds a new subset of grenades that shoot projectiles * Low alpha now makes HUDs and tooltips not show up on you * Fixes a UI bug with emptying currently-open bags into smartfridges...hopefully. (#5515) * Update smartfridge.dm * actually indicates which line solves the bug * Adds a whole bunch of Exosuit weapons and other miscellaneous parts. * Minifrags now use the small fragments mainly as they should. * Iced beer no longer freezes you to 3 degrees C, which is enough to seriously burn a Skrell. Seriously, that's weird. * Touch stuff in reference to responses. * NanoUI now processes again * Initial Work: Manifest, Newsfeed * Adds newscast viewing, manifest * Cartridge devices * Template progress * Med records, Sec records, Emp records * Cartridge work part 1 * Cartridge work: part 2 * Power monitoring console * Cartridges have persistent, internal data * Code to load element-specific data upon request, instead of serving all relevant data at once * Janitorial Supply Locator * Refactor crew manifest to a separate file * GPS cartridge * Reorganize GPS to proper organization, important comments * Supply cartridge * Status display access * Merc blast door controller * Appeases travis (Round 1) * Appeases travis (Round 2) * Headset sprites are now on the default ear, which is left * Cleave changes, attack code cleanup * Catching is no longer guaranteed, accuracy code is more general * Adds a Neural implant for future implementation. Promethean brains have been updated to fit it. * changelog * Robots can attack things again * Might help with air subsystem lag * Ports the spinny throwing animation from Bay * Cult heal modifier no longer does Shit-Tons of agony. Does mediocre agony on non-cultists. * Defines. * Headset sprite tweaks * Shield Drone no longer auto-fails with Energy Relays. * I'm an idiot. * PoIs can be rotated in increments of 90 degrees * Might fix the server startup error_handler runtime * Cult Girders are back to being proper. * Submaps can now be rotated to any cardinal direction (South is default) * Should fix another runtime with tools * Buffs the Vox * Removes debug code (Yes, I'm an idiot) * Ready for merge * Fixes some bugs tangentially related to Vox code * Ports /vg/ instrument frame work, adds client based sound pref Also shifts sound files which is 98% of the bulk here. * Helmets now show only certain hairstyles * fixes the trailing tag, I think * Scrubbers no longer automatically scrub phoron (#5512) * adds manual changelog * Adds new set of cyborg sprites for medical/science/default/security/combat (#5546) * Refactor cargo trains, they're just normal trains now. Adds the Quad, and re-enables/fixes the Space Bike! * communicator_header.tmpl now correctly includes Body * Adds tails to Unathi rig suit sprites (#5551) * supplycom/control drops the correct circuit * Emags have an effect on cargo consoles * The cybersuit is now a space suit. * Map Bugfixes - Fix for mislabeled c_tag cameras, first deck - Fix for mislabeled c_tag cameras, second deck - Fix for poi crashed containment shuttle mapping issues (terrain generation) - Fixed wrong floor type on skipjack - Fix for scrubbers pipe, central substation - Fix for air supply pipe, chapel - Fixed scrubber pipe, Engineering Drone Fab - Fix for air supply pipe, Prison Wing - Removed redundant supply and scrubber pipe, Security Auxiliary Dock - Fix, Fore Aux Dock airlock pipe. - Fix air supply pipe, library - Fix, scrubber pipe, coffee shop - Pipe fix, Medical maint - Fix, supply pipe medical secondary storage - Removal, redundant supply pipe, cargo maint - Fix, virology scrubbers pipes - Fix Xenobio and Xenoflora missing atmos connection to the main outpost - Fix, missing atmos connections between Main outpost telecoms and main outpost atmos - Fix for missing power wires, HoS Office, Warden Office, Heads of Staff Meeting Room - New, random mouse spawner - New, random mouse spawners added throughout maintenance on the station (maybe too many, maus station 13) - New, 30 sheets of lead added to engineering - Fix, POIs should now be rad protected and characters won’t be affected by the radiation event * Fixes Lead Walls (#5562) A material's ``radiation_resistance`` was never considered for calculating a wall's cached resistance to radiation. This fixes it. There is another issue involving r-walls not being better at stopping radiation than their normal-wall counterparts made of the same material but fixing that involves a lot of number adjusting to avoid the SM engine from getting twice as protective. * Yet Another Circuit Update (#5549) * Circuit updates, adds new components, improves printer, new assemblies. * Finishes powernet circuit. * Adds wearable assemblies. * Finialization before merging with GLOB port. * Finishes circuit update, hopefully. * Forgot to undo map. * Removes debug output. * Readds size traits * Signal pistol can be reloaded (#5566) * Makes Blobs more useful. * Rig and Spacesuit additions - Added the 'military' Rigsuit from Bay. - Added 'pmc' rigsuits - Added exploration and pilot voidsuits along with alternate sprites (alternate sprites done by Naidh) - Addition of suit cyclers for exploration and pilot voidsuits None of these suits are currently accessible in game outside of admin bus. Currently only the pilot voidsuits have other species sprites. Exploration suits are missing sprites for Teshari (Naidh made some for their alternates but I have to add them) and the rig suits are human only. This is to be fixed in the near future, just wanted to get the make workload actually in the game first. * Dermal implant doesn't cover hair * Fixes a couple of tool related oversight/runtimes * Fixes hand and leg cuffs * Technically adds the Ore Redemption Machine * Update combat.dm * Boot knives fit in boots * Adds tails to Unathi rigsuits (again) * PoI fix * Skrell names no longer contain spaces * Descriptors now properly respect species differences * Make the Statue NOT entirely immortal. * Psychiatric Medication Fix (#5588) * Psychiatric medications are faster when ingested * Psychiatric med fix * Updates changelog * Tweaks emitters and Pacman * Adds the Biopsy Scanner to the Surgery Kit (#5589) * Adds the Biopsy Scanner to the Surgery Kit Since it's actually used in a surgical operation, it should proooobably be in the kit. Iunno if the kit is really used here aside from antag shuttles, but they might as well have it. * Added a missing comma Missed a comma, might be what's causing issues. Iunno. It worked flawlessly in dream-maker. * Adds some Holy drinks, and Promethean-safe drinks / acclimators. (#5574) * Adds some Holy drinks, and Promethean-safe drinks / acclimators. * Carbon + Water + Oil = Sludge * TRUEFALSE & * removed * Be Smart about damage things. * Don't spawn things in Null please. * Adds a generic proc to the mining vendor to add custom / blank entries. * Keys now actually exist again. * Species item slowdown changes * Pose now shows up under descriptors * Fixes Circuitry Glasses. Button in HUD should work now. * Phase rifle size correction * Should fix the new bugs with webslinger spiders (#5612) * Hyposprays can now have different sounds * admin helps, but working this time. * handle issue, GLOB staffwho * admin list seems bork'd cleans up feedback messages * Fixes grabs breaking defined mob pixel offsets. Yeah. * Custom RIG Framework (#5613) * Framework for Custom RIG sprites. * Fixfix * line ending * Text for handheld plushies when poked Plushies now make sounds when poked. Squeak! Ported from https://github.com/VOREStation/VOREStation/pull/4231 * Shotgun cycling animation framework This adds the possiblity for empty sprites on all shotgun/pump/thing and for cycling animations. https://cdn.discordapp.com/attachments/407267031562453032/488751327531368481/2018-09-10_18-43-05.gif This particular weapon was made by a friend so i'll wait for their permission before porting it in. * Add an animated rifle. Nothing is particularly impressive except the animation. * Fixes some bloodloss bugs * Move almost everythign food related into the kitchen module. Not moving reagents and tools. * Minor issues fix. * Remplace sprite hammer with pickaxe This particular hammer had been sitting 'waiting for sprites' for 4 years at least. Could be a lot more really. Fixeshttps://github.com/VOREStation/VOREStation/issues/4183 * Fix mislabelled posters. https://github.com/VOREStation/VOREStation/pull/4310 https://github.com/VOREStation/VOREStation/issues/3597 * Remove kobold.dm This file has no sprites and is used nowhere. It does have some kinda cute emotes but without sprites it's useless and has been since 2017 and maybe much longer. I haven't found any references of it's origin either. ~~maybe virgo will do sprites i dunno~~ * Fix yes emote not working correctly. It's a lazy fix but it works. * Fixes chem master dumping reagents. Previously, if you used a bluespace beaker and transferred all of it's contents, the chem master buffer would silently drop all of those chemicals without warning. * Fixed smes terminal construction requiring more cable than used. * Fixes laptop blocking grown adults. * Fixes several typos with oxygen_pump.dm. * Fix the condimaster not working. Previously, you simply couldn't make any condiment using this machine. Now you can. There was just missing template which is back in with this PR. (Thanks aronai.) This means you should consider remplacing it in your kitchens. * Remove intensity from chemistry machines. * Add a noise for mining scanners. This should affects all devices using it too. * Prevents people from HREF exploiting around the R&D console. * Lock has a check already, so remove that. * reeeeeeeee * Fixes missing sprites when excavating rocks * Xenoflora and Xenobio House Move - Moves Xenoflora and Xenobio stationside, on first deck. Leaves the old labs still up planetside for the time being. - Minor bug fixes, missing lights, mislabeled lockers in robotics, floor decals. * Changes << to to_chat at request. * wax staxs * Fix plastic ashtrays only holding one butt. Now they hold 4butts. jeez bill. * Move surgery caps into their own selection. * Fixes maploading Imagine you're on the last iteration of this loop, you've done the final column of X coordinates and you're going to set maxx. Would you want to set it to where you are now, the final X column... or would you want to add ONE MORE beyond the template size for some reason then set it to that? This bug causes all templates that are the size of normal maps to fail to initialize any atoms if your template is the size of your normal maps, because it tries to obtain a square of size minx, miny, minz, maxx, maxy, maxz to initialize, however maxx is nonextant because it exists outside the bounds of the world. It also causes all submaps to initialize an additional column of atoms twice, or not initialize any if they spawn against the right edge of the map. * Graves (#5622) * Adds support for closets storing closets, and graves * More Grave Things * Chnglog * Polaris Vision Tweaks * Fix a couple of ticket bugs Don't show admin character names when they reply, and this proc appears to take different options on tg, so was fixed here. * Prevent people from removing papers from any distances. * Removes maintenance access from cleanbots This should stop them from wandering into maintenance never to be seen or heard from again. * Remove very annoying midi tools * Magazines improvements (#5666) * Give sounds to emptying magazines * Clear some trash in the saber magazines * The magazine NOW behaves correctly. * The second half and more casing noises. * Fixes map and makes everything compile.
2026-07-13 17:22:41 +01:00 · 2018-10-20 17:05:50 -04:00
parent a7c4ac27c9
commit 88398773b8
161 changed files with 10777 additions and 8198 deletions
@@ -0,0 +1,46 @@
+/obj/effect/temp_visual/decoy
+	desc = "It's a decoy!"
+	duration = 15
+
+/obj/effect/temp_visual/decoy/initialize(mapload, atom/mimiced_atom, var/customappearance)
+	. = ..()
+	alpha = initial(alpha)
+	if(mimiced_atom)
+		name = mimiced_atom.name
+		appearance = mimiced_atom.appearance
+		set_dir(mimiced_atom.dir)
+		mouse_opacity = 0
+	if(customappearance)
+		appearance = customappearance
+
+/obj/effect/temp_visual/decoy/fading/initialize(mapload, atom/mimiced_atom)
+	. = ..()
+	animate(src, alpha = 0, time = duration)
+
+/obj/effect/temp_visual/decoy/fading/fivesecond
+	duration = 50
+
+/obj/effect/temp_visual/small_smoke
+	icon_state = "smoke"
+	duration = 50
+
+// VOREStation Add - Used by Kinetic Accelerator
+/obj/effect/temp_visual/kinetic_blast
+	name = "kinetic explosion"
+	icon = 'icons/obj/projectiles.dmi'
+	icon_state = "kinetic_blast"
+	layer = ABOVE_MOB_LAYER
+	duration = 4
+
+/obj/effect/temp_visual/explosion
+	name = "explosion"
+	icon = 'icons/effects/96x96.dmi'
+	icon_state = "explosion"
+	pixel_x = -32
+	pixel_y = -32
+	duration = 8
+
+/obj/effect/temp_visual/explosion/fast
+	icon_state = "explosionfast"
+	duration = 4
+// VOREStation Add End
@@ -0,0 +1,36 @@
+//temporary visual effects
+/obj/effect/temp_visual
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "nothing"
+	anchored = TRUE
+	layer = ABOVE_MOB_LAYER
+	mouse_opacity = 0
+	var/duration = 10 //in deciseconds
+	var/randomdir = TRUE
+
+/obj/effect/temp_visual/initialize()
+	. = ..()
+	if(randomdir)
+		set_dir(pick(cardinal))
+
+	spawn(duration)
+		qdel(src)
+
+/obj/effect/temp_visual/singularity_act()
+	return
+
+/obj/effect/temp_visual/singularity_pull()
+	return
+
+/obj/effect/temp_visual/ex_act()
+	return
+
+/*
+/obj/effect/temp_visual/dir_setting
+	randomdir = FALSE
+
+/obj/effect/temp_visual/dir_setting/Initialize(mapload, set_dir)
+	if(set_dir)
+		setDir(set_dir)
+	. = ..()
+*/		//More tg stuff that might be useful later
@@ -111,6 +111,13 @@
 		src.loc = null
 	return ..()

+// Check if target is reasonable for us to operate on.
+/obj/item/proc/check_allowed_items(atom/target, not_inside, target_self)
+	if(((src in target) && !target_self) || ((!istype(target.loc, /turf)) && (!istype(target, /turf)) && (not_inside)))
+		return FALSE
+	else
+		return TRUE
+
 /obj/item/proc/update_twohanding()
 	update_held_icon()

@@ -622,7 +629,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.

 	var/cannotzoom

-	if(usr.stat || !(istype(usr,/mob/living/carbon/human)))
+	if((usr.stat && !zoom) || !(istype(usr,/mob/living/carbon/human)))
 		usr << "You are unable to focus through the [devicename]"
 		cannotzoom = 1
 	else if(!zoom && global_hud.darkMask[1] in usr.client.screen)
@@ -632,39 +639,46 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 		usr << "You are too distracted to look through the [devicename], perhaps if it was in your active hand this might work better"
 		cannotzoom = 1

+	//We checked above if they are a human and returned already if they weren't.
+	var/mob/living/carbon/human/H = usr
+
 	if(!zoom && !cannotzoom)
-		if(usr.hud_used.hud_shown)
-			usr.toggle_zoom_hud()	// If the user has already limited their HUD this avoids them having a HUD when they zoom in
-		usr.client.view = viewsize
+		if(H.hud_used.hud_shown)
+			H.toggle_zoom_hud()	// If the user has already limited their HUD this avoids them having a HUD when they zoom in
+		H.client.view = viewsize
 		zoom = 1

 		var/tilesize = 32
 		var/viewoffset = tilesize * tileoffset

-		switch(usr.dir)
+		switch(H.dir)
 			if (NORTH)
-				usr.client.pixel_x = 0
-				usr.client.pixel_y = viewoffset
+				H.client.pixel_x = 0
+				H.client.pixel_y = viewoffset
 			if (SOUTH)
-				usr.client.pixel_x = 0
-				usr.client.pixel_y = -viewoffset
+				H.client.pixel_x = 0
+				H.client.pixel_y = -viewoffset
 			if (EAST)
-				usr.client.pixel_x = viewoffset
-				usr.client.pixel_y = 0
+				H.client.pixel_x = viewoffset
+				H.client.pixel_y = 0
 			if (WEST)
-				usr.client.pixel_x = -viewoffset
-				usr.client.pixel_y = 0
+				H.client.pixel_x = -viewoffset
+				H.client.pixel_y = 0

-		usr.visible_message("[usr] peers through the [zoomdevicename ? "[zoomdevicename] of the [src.name]" : "[src.name]"].")
+		H.visible_message("[usr] peers through the [zoomdevicename ? "[zoomdevicename] of the [src.name]" : "[src.name]"].")
+		H.looking_elsewhere = TRUE
+		H.handle_vision()

 	else
-		usr.client.view = world.view
-		if(!usr.hud_used.hud_shown)
-			usr.toggle_zoom_hud()
+		H.client.view = world.view
+		if(!H.hud_used.hud_shown)
+			H.toggle_zoom_hud()
 		zoom = 0

-		usr.client.pixel_x = 0
-		usr.client.pixel_y = 0
+		H.client.pixel_x = 0
+		H.client.pixel_y = 0
+		H.looking_elsewhere = FALSE
+		H.handle_vision()

 		if(!cannotzoom)
 			usr.visible_message("[zoomdevicename ? "[usr] looks up from the [src.name]" : "[usr] lowers the [src.name]"].")
@@ -149,6 +149,52 @@
 		return
 	return ..()

+/obj/item/device/kit/suit/rig
+	name = "rig modification kit"
+	desc = "A kit for modifying a rigsuit."
+	uses = 1
+
+/obj/item/device/kit/suit/rig/customize(var/obj/item/I, var/mob/user)
+	var/obj/item/weapon/rig/RIG = I
+	RIG.suit_state = new_icon
+	RIG.suit_type = "customized [initial(RIG.suit_type)]"
+	RIG.name = "[new_name]"
+	RIG.desc = new_desc
+	RIG.icon = new_icon_file
+	RIG.icon_state = new_icon
+	RIG.icon_override = new_icon_override_file
+	for(var/obj/item/piece in list(RIG.gloves,RIG.helmet,RIG.boots,RIG.chest))
+		if(!istype(piece))
+			continue
+		piece.name = "[RIG.suit_type] [initial(piece.name)]"
+		piece.desc = "It seems to be part of a [RIG.name]."
+		piece.icon_state = "[RIG.suit_state]"
+		if(istype(piece, /obj/item/clothing/shoes))
+			icon = 'icons/mob/custom_items_rig_boots.dmi'
+			icon_override = 'icons/mob/custom_items_rig_boots.dmi'
+		if(istype(piece, /obj/item/clothing/suit))
+			icon = 'icons/mob/custom_items_rig_suit.dmi'
+			icon_override = 'icons/mob/custom_items_rig_suit.dmi'
+		if(istype(piece, /obj/item/clothing/head))
+			icon = 'icons/mob/custom_items_rig_helmet.dmi'
+			icon_override = 'icons/mob/custom_items_rig_helmet.dmi'
+		if(istype(piece, /obj/item/clothing/gloves))
+			icon = 'icons/mob/custom_items_rig_gloves.dmi'
+			icon_override = 'icons/mob/custom_items_rig_gloves.dmi'
+	if(RIG.helmet && istype(RIG.helmet, /obj/item/clothing/head/helmet) && new_light_overlay)
+		var/obj/item/clothing/head/helmet/H = RIG.helmet
+		H.light_overlay = new_light_overlay
+	use(1,user)
+
+/obj/item/device/kit/suit/rig/can_customize(var/obj/item/I)
+	return istype(I, /obj/item/weapon/rig)
+
+/obj/item/weapon/rig/attackby(var/obj/item/O, var/mob/user)
+	if(istype(O,/obj/item/device/kit/suit))
+		var/obj/item/device/kit/suit/rig/kit = O
+		kit.customize(src, user)
+		return
+	return ..()

 /obj/item/device/kit/paint
 	name = "mecha customisation kit"
@@ -887,6 +887,7 @@
 	icon_state = "nymphplushie"
 	w_class = ITEMSIZE_TINY
 	var/last_message = 0
+	var/pokephrase = "Uww!"

 /obj/item/toy/plushie/attack_self(mob/user as mob)
 	if(world.time - last_message <= 1 SECOND)
@@ -899,6 +900,7 @@
 		user.visible_message("<span class='warning'><b>\The [user]</b> attempts to strangle [src]!</span>","<span class='warning'>You attempt to strangle [src]!</span>")
 	else
 		user.visible_message("<span class='notice'><b>\The [user]</b> pokes [src].</span>","<span class='notice'>You poke [src].</span>")
+		visible_message("[src] says, \"[pokephrase]\"")
 	last_message = world.time

 /obj/item/toy/plushie/verb/rename_plushie()
@@ -926,121 +928,199 @@
 	name = "diona nymph plush"
 	desc = "A plushie of an adorable diona nymph! While its level of self-awareness is still being debated, its level of cuteness is not."
 	icon_state = "nymphplushie"
+	pokephrase = "Chirp!"

 /obj/item/toy/plushie/mouse
 	name = "mouse plush"
 	desc = "A plushie of a delightful mouse! What was once considered a vile rodent is now your very best friend."
 	icon_state = "mouseplushie"
+	pokephrase = "Squeak!"

 /obj/item/toy/plushie/kitten
 	name = "kitten plush"
 	desc = "A plushie of a cute kitten! Watch as it purrs its way right into your heart."
 	icon_state = "kittenplushie"
+	pokephrase = "Mrow!"

 /obj/item/toy/plushie/lizard
 	name = "lizard plush"
 	desc = "A plushie of a scaly lizard! Very controversial, after being accused as \"racist\" by some Unathi."
 	icon_state = "lizardplushie"
+	pokephrase = "Hiss!"

 /obj/item/toy/plushie/spider
 	name = "spider plush"
 	desc = "A plushie of a fuzzy spider! It has eight legs - all the better to hug you with."
 	icon_state = "spiderplushie"
+	pokephrase = "Sksksk!"

 /obj/item/toy/plushie/farwa
 	name = "farwa plush"
 	desc = "A farwa plush doll. It's soft and comforting!"
 	icon_state = "farwaplushie"
+	pokephrase = "Squaw!"

 /obj/item/toy/plushie/corgi
 	name = "corgi plushie"
 	icon_state = "corgi"
+	pokephrase = "Woof!"

 /obj/item/toy/plushie/girly_corgi
 	name = "corgi plushie"
 	icon_state = "girlycorgi"
+	pokephrase = "Arf!"

 /obj/item/toy/plushie/robo_corgi
 	name = "borgi plushie"
 	icon_state = "robotcorgi"
+	pokephrase = "Bark."

 /obj/item/toy/plushie/octopus
 	name = "octopus plushie"
 	icon_state = "loveable"
+	pokephrase = "Squish!"

 /obj/item/toy/plushie/face_hugger
 	name = "facehugger plushie"
 	icon_state = "huggable"
+	pokephrase = "Hug!"

 //foxes are basically the best

 /obj/item/toy/plushie/red_fox
 	name = "red fox plushie"
 	icon_state = "redfox"
+	pokephrase = "Gecker!"

 /obj/item/toy/plushie/black_fox
 	name = "black fox plushie"
 	icon_state = "blackfox"
+	pokephrase = "Ack!"

 /obj/item/toy/plushie/marble_fox
 	name = "marble fox plushie"
 	icon_state = "marblefox"
+	pokephrase = "Awoo!"

 /obj/item/toy/plushie/blue_fox
 	name = "blue fox plushie"
 	icon_state = "bluefox"
+	pokephrase = "Yoww!"

 /obj/item/toy/plushie/orange_fox
 	name = "orange fox plushie"
 	icon_state = "orangefox"
+	pokephrase = "Yagh!"

 /obj/item/toy/plushie/coffee_fox
 	name = "coffee fox plushie"
 	icon_state = "coffeefox"
+	pokephrase = "Gerr!"

 /obj/item/toy/plushie/pink_fox
 	name = "pink fox plushie"
 	icon_state = "pinkfox"
+	pokephrase = "Yack!"

 /obj/item/toy/plushie/purple_fox
 	name = "purple fox plushie"
 	icon_state = "purplefox"
+	pokephrase = "Whine!"

 /obj/item/toy/plushie/crimson_fox
 	name = "crimson fox plushie"
 	icon_state = "crimsonfox"
+	pokephrase = "Auuu!"

 /obj/item/toy/plushie/deer
 	name = "deer plushie"
 	icon_state = "deer"
+	pokephrase = "Bleat!"

 /obj/item/toy/plushie/black_cat
 	name = "black cat plushie"
 	icon_state = "blackcat"
+	pokephrase = "Mlem!"

 /obj/item/toy/plushie/grey_cat
 	name = "grey cat plushie"
 	icon_state = "greycat"
+	pokephrase = "Mraw!"

 /obj/item/toy/plushie/white_cat
 	name = "white cat plushie"
 	icon_state = "whitecat"
+	pokephrase = "Mew!"

 /obj/item/toy/plushie/orange_cat
 	name = "orange cat plushie"
 	icon_state = "orangecat"
+	pokephrase = "Meow!"

 /obj/item/toy/plushie/siamese_cat
 	name = "siamese cat plushie"
 	icon_state = "siamesecat"
+	pokephrase = "Mrew?"

 /obj/item/toy/plushie/tabby_cat
 	name = "tabby cat plushie"
 	icon_state = "tabbycat"
+	pokephrase = "Purr!"

 /obj/item/toy/plushie/tuxedo_cat
 	name = "tuxedo cat plushie"
 	icon_state = "tuxedocat"
+	pokephrase = "Mrowww!!"
+
+// nah, squids are better than foxes :>
+
+/obj/item/toy/plushie/squid/green
+	name = "green squid plushie"
+	desc = "A small, cute and loveable squid friend. This one is green."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "greensquid"
+	slot_flags = SLOT_HEAD
+	pokephrase = "Squrr!"
+
+/obj/item/toy/plushie/squid/mint
+	name = "mint squid plushie"
+	desc = "A small, cute and loveable squid friend. This one is mint coloured."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "mintsquid"
+	slot_flags = SLOT_HEAD
+	pokephrase = "Blurble!"
+
+/obj/item/toy/plushie/squid/blue
+	name = "blue squid plushie"
+	desc = "A small, cute and loveable squid friend. This one is blue."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "bluesquid"
+	slot_flags = SLOT_HEAD
+	pokephrase = "Blob!"
+
+/obj/item/toy/plushie/squid/orange
+	name = "orange squid plushie"
+	desc = "A small, cute and loveable squid friend. This one is orange."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "orangesquid"
+	slot_flags = SLOT_HEAD
+	pokephrase = "Squash!"
+
+/obj/item/toy/plushie/squid/yellow
+	name = "yellow squid plushie"
+	desc = "A small, cute and loveable squid friend. This one is yellow."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "yellowsquid"
+	slot_flags = SLOT_HEAD
+	pokephrase = "Glorble!"
+
+/obj/item/toy/plushie/squid/pink
+	name = "pink squid plushie"
+	desc = "A small, cute and loveable squid friend. This one is pink."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "pinksquid"
+	slot_flags = SLOT_HEAD
+	pokephrase = "Wobble!"

 // nah, squids are better than foxes :>

@@ -1322,4 +1402,4 @@
 	icon_state = "tinyxmastree"
 	w_class = ITEMSIZE_TINY
 	force = 1
-	throwforce = 1
+	throwforce = 1
@@ -283,7 +283,7 @@ var/last_chew = 0
 	target.update_inv_legcuffed()
 	if(target.m_intent != "walk")
 		target.m_intent = "walk"
-		if(target.hud_used && user.hud_used.move_intent)
+		if(target.hud_used && target.hud_used.move_intent)
 			target.hud_used.move_intent.icon_state = "walking"
 	return 1

@@ -334,6 +334,6 @@ var/last_chew = 0
 	target.update_inv_legcuffed()
 	if(target.m_intent != "walk")
 		target.m_intent = "walk"
-		if(target.hud_used && user.hud_used.move_intent)
+		if(target.hud_used && target.hud_used.move_intent)
 			target.hud_used.move_intent.icon_state = "walking"
-	return 1
+	return 1
@@ -30,6 +30,8 @@
 	var/rank = null			//actual job
 	var/dorm = 0			// determines if this ID has claimed a dorm already

+	var/mining_points = 0	// For redeeming at mining equipment vendors
+
 /obj/item/weapon/card/id/examine(mob/user)
 	set src in oview(1)
 	if(in_range(usr, src))
@@ -14,7 +14,7 @@ var/global/list/ashtray_cache = list()
 	if(!material)
 		qdel(src)
 		return
-	max_butts = round(material.hardness/10) //This is arbitrary but whatever.
+	max_butts = round(material.hardness/5) //This is arbitrary but whatever.
 	src.pixel_y = rand(-5, 5)
 	src.pixel_x = rand(-6, 6)
 	update_icon()
@@ -132,7 +132,8 @@
 		/obj/item/weapon/surgical/FixOVein,
 		/obj/item/stack/medical/advanced/bruise_pack,
 		/obj/item/stack/nanopaste,
-		/obj/item/device/healthanalyzer/advanced
+		/obj/item/device/healthanalyzer/advanced,
+		/obj/item/weapon/autopsy_scanner
 		)

 	starts_with = list(
@@ -146,7 +147,8 @@
 		/obj/item/weapon/surgical/bonegel,
 		/obj/item/weapon/surgical/FixOVein,
 		/obj/item/stack/medical/advanced/bruise_pack,
-		/obj/item/device/healthanalyzer/advanced
+		/obj/item/device/healthanalyzer/advanced,
+		/obj/item/weapon/autopsy_scanner
 		)

 /obj/item/weapon/storage/firstaid/clotting
@@ -201,4 +201,4 @@
 	return pick(prob(15);/mob/living/simple_mob/animal/passive/mouse/white,
 				prob(30);/mob/living/simple_mob/animal/passive/mouse/brown,
 				prob(30);/mob/living/simple_mob/animal/passive/mouse/gray,
-				prob(25);/obj/random/mouseremains) //because figuring out how to come up with it picking nothing is beyond my coding ability.
+				prob(25);/obj/random/mouseremains) //because figuring out how to come up with it picking nothing is beyond my coding ability.
@@ -9,18 +9,26 @@
 	var/icon_closed = "closed"
 	var/icon_opened = "open"
 	var/opened = 0
-	var/welded = 0
+	var/sealed = 0
+	var/seal_tool = /obj/item/weapon/weldingtool	//Tool used to seal the closet, defaults to welder
 	var/wall_mounted = 0 //never solid (You can always pass over it)
 	var/health = 100
+
 	var/breakout = 0 //if someone is currently breaking out. mutex
+	var/breakout_time = 2 //2 minutes by default
+	var/breakout_sound = 'sound/effects/grillehit.ogg'	//Sound that plays while breaking out
+
 	var/storage_capacity = 2 * MOB_MEDIUM //This is so that someone can't pack hundreds of items in a locker/crate
 							  //then open it in a populated area to crash clients.
+	var/storage_cost = 40	//How much space this closet takes up if it's stuffed in another closet
+
 	var/open_sound = 'sound/machines/click.ogg'
 	var/close_sound = 'sound/machines/click.ogg'

-	var/store_misc = 1
-	var/store_items = 1
-	var/store_mobs = 1
+	var/store_misc = 1		//Chameleon item check
+	var/store_items = 1		//Will the closet store items?
+	var/store_mobs = 1		//Will the closet store mobs?
+	var/max_closets = 0		//Number of other closets allowed on tile before it won't close.

 	var/list/starts_with

@@ -41,7 +49,7 @@
 			content_size += Ceiling(I.w_class/2)
 		if(content_size > storage_capacity-5)
 			storage_capacity = content_size + 5
-
+	update_icon()

 /obj/structure/closet/examine(mob/user)
 	if(..(user, 1) && !opened)
@@ -50,29 +58,33 @@
 			if(!I.anchored)
 				content_size += Ceiling(I.w_class/2)
 		if(!content_size)
-			user << "It is empty."
+			to_chat(user, "It is empty.")
 		else if(storage_capacity > content_size*4)
-			user << "It is barely filled."
+			to_chat(user, "It is barely filled.")
 		else if(storage_capacity > content_size*2)
-			user << "It is less than half full."
+			to_chat(user, "It is less than half full.")
 		else if(storage_capacity > content_size)
-			user << "There is still some free space."
+			to_chat(user, "There is still some free space.")
 		else
-			user << "It is full."
+			to_chat(user, "It is full.")

 /obj/structure/closet/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	if(air_group || (height==0 || wall_mounted)) return 1
 	return (!density)

 /obj/structure/closet/proc/can_open()
-	if(src.welded)
+	if(src.sealed)
 		return 0
 	return 1

 /obj/structure/closet/proc/can_close()
+	var/closet_count = 0
 	for(var/obj/structure/closet/closet in get_turf(src))
 		if(closet != src)
-			return 0
+			if(!closet.anchored)
+				closet_count ++
+	if(closet_count > max_closets)
+		return 0
 	return 1

 /obj/structure/closet/proc/dump_contents()
@@ -101,7 +113,7 @@
 	src.icon_state = src.icon_opened
 	src.opened = 1
 	playsound(src.loc, open_sound, 15, 1, -3)
-	density = 0
+	density = !density
 	return 1

 /obj/structure/closet/proc/close()
@@ -118,12 +130,14 @@
 		stored_units += store_items(stored_units)
 	if(store_mobs)
 		stored_units += store_mobs(stored_units)
+	if(max_closets)
+		stored_units += store_closets(stored_units)

 	src.icon_state = src.icon_closed
 	src.opened = 0

 	playsound(src.loc, close_sound, 15, 1, -3)
-	density = 1
+	density = !density
 	return 1

 //Cham Projector Exception
@@ -161,9 +175,25 @@
 		added_units += M.mob_size
 	return added_units

+/obj/structure/closet/proc/store_closets(var/stored_units)
+	var/added_units = 0
+	for(var/obj/structure/closet/C in src.loc)
+		if(C == src)	//Don't store ourself
+			continue
+		if(C.anchored)	//Don't worry about anchored things on the same tile
+			continue
+		if(C.max_closets)	//Prevents recursive storage
+			continue
+		if(stored_units + added_units + storage_cost > storage_capacity)
+			break
+		C.forceMove(src)
+		added_units += storage_cost
+	return added_units
+
+
 /obj/structure/closet/proc/toggle(mob/user as mob)
 	if(!(src.opened ? src.close() : src.open()))
-		user << "<span class='notice'>It won't budge!</span>"
+		to_chat(user, "<span class='notice'>It won't budge!</span>")
 		return
 	update_icon()

@@ -221,7 +251,7 @@
 				if(!WT.isOn())
 					return
 				else
-					user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
+					to_chat(user, "<span class='notice'>You need more welding fuel to complete this task.</span>")
 					return
 			playsound(src, WT.usesound, 50)
 			new /obj/item/stack/material/steel(src.loc)
@@ -247,21 +277,25 @@
 			W.forceMove(src.loc)
 	else if(istype(W, /obj/item/weapon/packageWrap))
 		return
-	else if(istype(W, /obj/item/weapon/weldingtool))
-		var/obj/item/weapon/weldingtool/WT = W
-		if(!WT.remove_fuel(0,user))
-			if(!WT.isOn())
-				return
-			else
-				user << "<span class='notice'>You need more welding fuel to complete this task.</span>"
-				return
-		playsound(src, WT.usesound, 50)
-		src.welded = !src.welded
-		src.update_icon()
-		for(var/mob/M in viewers(src))
-			M.show_message("<span class='warning'>[src] has been [welded?"welded shut":"unwelded"] by [user.name].</span>", 3, "You hear welding.", 2)
+	else if(seal_tool)
+		if(istype(W, seal_tool))
+			var/obj/item/weapon/S = W
+			if(istype(S, /obj/item/weapon/weldingtool))
+				var/obj/item/weapon/weldingtool/WT = S
+				if(!WT.remove_fuel(0,user))
+					if(!WT.isOn())
+						return
+					else
+						to_chat(user, "<span class='notice'>You need more welding fuel to complete this task.</span>")
+						return
+			if(do_after(user, 20 * S.toolspeed))
+				playsound(src, S.usesound, 50)
+				src.sealed = !src.sealed
+				src.update_icon()
+				for(var/mob/M in viewers(src))
+					M.show_message("<span class='warning'>[src] has been [sealed?"sealed":"unsealed"] by [user.name].</span>", 3)
 	else if(W.is_wrench())
-		if(welded)
+		if(sealed)
 			if(anchored)
 				user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.")
 			else
@@ -269,7 +303,7 @@
 			playsound(src, W.usesound, 50)
 			if(do_after(user, 20 * W.toolspeed))
 				if(!src) return
-				user << "<span class='notice'>You [anchored? "un" : ""]secured \the [src]!</span>"
+				to_chat(user, "<span class='notice'>You [anchored? "un" : ""]secured \the [src]!</span>")
 				anchored = !anchored
 	else
 		src.attack_hand(user)
@@ -305,7 +339,7 @@
 		return

 	if(!src.open())
-		user << "<span class='notice'>It won't budge!</span>"
+		to_chat(user, "<span class='notice'>It won't budge!</span>")

 /obj/structure/closet/attack_hand(mob/user as mob)
 	src.add_fingerprint(user)
@@ -315,7 +349,7 @@
 /obj/structure/closet/attack_self_tk(mob/user as mob)
 	src.add_fingerprint(user)
 	if(!src.toggle())
-		usr << "<span class='notice'>It won't budge!</span>"
+		to_chat(usr, "<span class='notice'>It won't budge!</span>")

 /obj/structure/closet/attack_ghost(mob/ghost)
 	if(ghost.client && ghost.client.inquisitive_ghost)
@@ -335,14 +369,14 @@
 		src.add_fingerprint(usr)
 		src.toggle(usr)
 	else
-		usr << "<span class='warning'>This mob type can't use this verb.</span>"
+		to_chat(usr, "<span class='warning'>This mob type can't use this verb.</span>")

-/obj/structure/closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
+/obj/structure/closet/update_icon()//Putting the sealed stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
 	overlays.Cut()
 	if(!opened)
 		icon_state = icon_closed
-		if(welded)
-			overlays += "welded"
+		if(sealed)
+			overlays += "sealed"
 	else
 		icon_state = icon_opened

@@ -358,20 +392,19 @@
 /obj/structure/closet/proc/req_breakout()
 	if(opened)
 		return 0 //Door's open... wait, why are you in it's contents then?
-	if(!welded)
-		return 0 //closed but not welded...
+	if(!sealed)
+		return 0 //closed but not sealed...
 	return 1

 /obj/structure/closet/proc/mob_breakout(var/mob/living/escapee)
-	var/breakout_time = 2 //2 minutes by default

 	if(breakout || !req_breakout())
 		return

 	escapee.setClickCooldown(100)

-	//okay, so the closet is either welded or locked... resist!!!
-	escapee << "<span class='warning'>You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)</span>"
+	//okay, so the closet is either sealed or locked... resist!!!
+	to_chat(escapee, "<span class='warning'>You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)</span>")

 	visible_message("<span class='danger'>\The [src] begins to shake violently!</span>")

@@ -388,20 +421,20 @@
 			breakout = 0
 			return

-		playsound(src.loc, 'sound/effects/grillehit.ogg', 100, 1)
+		playsound(src.loc, breakout_sound, 100, 1)
 		animate_shake()
 		add_fingerprint(escapee)

 	//Well then break it!
 	breakout = 0
-	escapee << "<span class='warning'>You successfully break out!</span>"
+	to_chat(escapee, "<span class='warning'>You successfully break out!</span>")
 	visible_message("<span class='danger'>\The [escapee] successfully broke out of \the [src]!</span>")
-	playsound(src.loc, 'sound/effects/grillehit.ogg', 100, 1)
+	playsound(src.loc, breakout_sound, 100, 1)
 	break_open()
 	animate_shake()

 /obj/structure/closet/proc/break_open()
-	welded = 0
+	sealed = 0
 	update_icon()
 	//Do this to prevent contents from being opened into nullspace (read: bluespace)
 	if(istype(loc, /obj/structure/bigDelivery))
@@ -420,3 +453,9 @@

 /obj/structure/closet/AllowDrop()
 	return TRUE
+
+/obj/structure/closet/return_air_for_internal_lifeform(var/mob/living/L)
+	if(src.loc)
+		if(istype(src.loc, /obj/structure/closet))
+			return (loc.return_air_for_internal_lifeform(L))
+	return return_air()
@@ -4,9 +4,161 @@
 	icon_state = "coffin"
 	icon_closed = "coffin"
 	icon_opened = "coffin_open"
+	seal_tool = /obj/item/weapon/tool/screwdriver
+	breakout_sound = 'sound/weapons/tablehit1.ogg'

 /obj/structure/closet/coffin/update_icon()
 	if(!opened)
 		icon_state = icon_closed
 	else
 		icon_state = icon_opened
+
+/* Graves */
+/obj/structure/closet/grave
+	name = "grave"
+	desc = "Dirt."
+	icon_state = "grave"
+	icon_closed = "grave"
+	icon_opened = "grave_open"
+	seal_tool = null
+	breakout_sound = 'sound/weapons/thudswoosh.ogg'
+	anchored = 1
+	max_closets = 1
+	opened = 1
+
+/obj/structure/closet/grave/attack_hand(mob/user as mob)
+	if(opened)
+		visible_message("<span class='notice'>[user] starts to climb into \the [src.name].</span>", \
+						"<span class='notice'>You start to lower yourself into \the [src.name].</span>")
+		if(do_after(user, 50))
+			user.forceMove(src.loc)
+			visible_message("<span class='notice'>[user] climbs into \the [src.name].</span>", \
+							"<span class='notice'>You climb into \the [src.name].</span>")
+		else
+			visible_message("<span class='notice'>[user] decides not to climb into \the [src.name].</span>", \
+							"<span class='notice'>You stop climbing into \the [src.name].</span>")
+	return
+
+/obj/structure/closet/grave/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+	if(opened && ismob(mover))
+		var/mob/M = mover
+		add_fingerprint(M)
+		if(ishuman(M))
+			var/mob/living/carbon/human/H = M
+			if(H.m_intent == "walk")
+				to_chat(H, "<span class='warning'>You stop at the edge of \the [src.name].</span>")
+				return FALSE
+			else
+				to_chat(H, "<span class='warning'>You fall into \the [src.name]!</span>")
+				fall_in(H)
+				return TRUE
+		if(isrobot(M))
+			var/mob/living/silicon/robot/R = M
+			if(R.a_intent == I_HELP)
+				to_chat(R, "<span class='warning'>You stop at the edge of \the [src.name].</span>")
+				return FALSE
+			else
+				to_chat(R, "<span class='warning'>You enter \the [src.name].</span>")
+				return TRUE
+	return TRUE	//Everything else can move over the graves
+
+/obj/structure/closet/grave/proc/fall_in(mob/living/L)	//Only called on humans for now, but still
+	L.Weaken(5)
+	if(ishuman(L))
+		var/mob/living/carbon/human/H = L
+		var/limb_damage = rand(5,25)
+		H.adjustBruteLoss(limb_damage)
+
+/obj/structure/closet/grave/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(src.opened)
+		if(istype(W, /obj/item/weapon/shovel))
+			user.visible_message("<span class='notice'>[user] piles dirt into \the [src.name].</span>", \
+								 "<span class='notice'>You start to pile dirt into \the [src.name].</span>", \
+								 "<span class='notice'>You hear dirt being moved.</span>")
+			if(do_after(user, 40 * W.toolspeed))
+				user.visible_message("<span class='notice'>[user] pats down the dirt on top of \the [src.name].</span>", \
+								 "<span class='notice'>You finish filling in \the [src.name].</span>")
+				close()
+				return
+			else
+				user.visible_message("<span class='notice'>[user] stops filling in \the [src.name].</span>", \
+								 "<span class='notice'>You change your mind and stop filling in \the [src.name].</span>")
+				return
+		if(istype(W, /obj/item/weapon/grab))
+			var/obj/item/weapon/grab/G = W
+			src.MouseDrop_T(G.affecting, user)      //act like they were dragged onto the closet
+			return 0
+		if(istype(W,/obj/item/tk_grab))
+			return 0
+		if(istype(W, /obj/item/weapon/storage/laundry_basket) && W.contents.len)
+			var/obj/item/weapon/storage/laundry_basket/LB = W
+			var/turf/T = get_turf(src)
+			for(var/obj/item/I in LB.contents)
+				LB.remove_from_storage(I, T)
+			user.visible_message("<span class='notice'>[user] empties \the [LB] into \the [src].</span>", \
+								 "<span class='notice'>You empty \the [LB] into \the [src].</span>", \
+								 "<span class='notice'>You hear rustling of clothes.</span>")
+			return
+		if(isrobot(user))
+			return
+		if(W.loc != user) // This should stop mounted modules ending up outside the module.
+			return
+		usr.drop_item()
+		if(W)
+			W.forceMove(src.loc)
+	else
+		if(istype(W, /obj/item/weapon/shovel))
+			if(user.a_intent == I_HURT)	// Hurt intent means you're trying to kill someone, or just get rid of the grave
+				user.visible_message("<span class='notice'>[user] begins to smoothe out the dirt of \the [src.name].</span>", \
+									 "<span class='notice'>You start to smoothe out the dirt of \the [src.name].</span>", \
+									 "<span class='notice'>You hear dirt being moved.</span>")
+				if(do_after(user, 40 * W.toolspeed))
+					user.visible_message("<span class='notice'>[user] finishes smoothing out \the [src.name].</span>", \
+										 "<span class='notice'>You finish smoothing out \the [src.name].</span>")
+					if(LAZYLEN(contents))
+						alpha = 40	// If we've got stuff inside, like maybe a person, just make it hard to see us
+					else
+						qdel(src)	// Else, go away
+					return
+				else
+					user.visible_message("<span class='notice'>[user] stops concealing \the [src.name].</span>", \
+										 "<span class='notice'>You stop concealing \the [src.name].</span>")
+					return
+			else
+				user.visible_message("<span class='notice'>[user] begins to unearth \the [src.name].</span>", \
+									 "<span class='notice'>You start to unearth \the [src.name].</span>", \
+									 "<span class='notice'>You hear dirt being moved.</span>")
+				if(do_after(user, 40 * W.toolspeed))
+					user.visible_message("<span class='notice'>[user] reaches the bottom of \the [src.name].</span>", \
+										 "<span class='notice'>You finish digging out \the [src.name].</span>")
+					break_open()
+					return
+				else
+					user.visible_message("<span class='notice'>[user] stops digging out \the [src.name].</span>", \
+										 "<span class='notice'>You stop digging out \the [src.name].</span>")
+					return
+	return
+
+/obj/structure/closet/grave/close()
+	..()
+	if(!opened)
+		sealed = TRUE
+
+/obj/structure/closet/grave/open()
+	.=..()
+	alpha = 255	// Needed because of grave hiding
+
+/obj/structure/closet/grave/bullet_act(var/obj/item/projectile/P)
+	return PROJECTILE_CONTINUE	// It's a hole in the ground, doesn't usually stop or even care about bullets
+
+/obj/structure/closet/grave/return_air_for_internal_lifeform(var/mob/living/L)
+	var/gasid = "carbon_dioxide"
+	if(ishuman(L))
+		var/mob/living/carbon/human/H = L
+		if(H.species && H.species.exhale_type)
+			gasid = H.species.exhale_type
+	var/datum/gas_mixture/grave_breath = new()
+	var/datum/gas_mixture/above_air = return_air()
+	grave_breath.adjust_gas(gasid, BREATH_MOLES)
+	grave_breath.temperature = (above_air.temperature) - 30	//Underground
+	return grave_breath
@@ -43,8 +43,8 @@

 		overlays += icon(src.icon, "door")

-		if(welded)
-			overlays += icon(src.icon,"welded")
+		if(sealed)
+			overlays += icon(src.icon,"sealed")

 		if(broken)
 			overlays += icon(src.icon,"broken")
@@ -46,23 +46,23 @@

 /obj/structure/closet/secure_closet/proc/togglelock(mob/user as mob)
 	if(src.opened)
-		user << "<span class='notice'>Close the locker first.</span>"
+		to_chat(user, "<span class='notice'>Close the locker first.</span>")
 		return
 	if(src.broken)
-		user << "<span class='warning'>The locker appears to be broken.</span>"
+		to_chat(user, "<span class='warning'>The locker appears to be broken.</span>")
 		return
 	if(user.loc == src)
-		user << "<span class='notice'>You can't reach the lock from inside.</span>"
+		to_chat(user, "<span class='notice'>You can't reach the lock from inside.</span>")
 		return
 	if(src.allowed(user))
 		src.locked = !src.locked
 		playsound(src.loc, 'sound/machines/click.ogg', 15, 1, -3)
 		for(var/mob/O in viewers(user, 3))
 			if((O.client && !( O.blinded )))
-				O << "<span class='notice'>The locker has been [locked ? null : "un"]locked by [user].</span>"
+				to_chat(O, "<span class='notice'>The locker has been [locked ? null : "un"]locked by [user].</span>")
 		update_icon()
 	else
-		user << "<span class='notice'>Access Denied</span>"
+		to_chat(user, "<span class='notice'>Access Denied</span>")

 /obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(src.opened)
@@ -73,7 +73,7 @@
 			if(src.large)
 				src.MouseDrop_T(G.affecting, user)	//act like they were dragged onto the closet
 			else
-				user << "<span class='notice'>The locker is too small to stuff [G.affecting] into!</span>"
+				to_chat(user, "<span class='notice'>The locker is too small to stuff [G.affecting] into!</span>")
 		if(isrobot(user))
 			return
 		if(W.loc != user) // This should stop mounted modules ending up outside the module.
@@ -89,14 +89,14 @@
 			playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
 			playsound(src.loc, "sparks", 50, 1)
 	else if(W.is_wrench())
-		if(welded)
+		if(sealed)
 			if(anchored)
 				user.visible_message("\The [user] begins unsecuring \the [src] from the floor.", "You start unsecuring \the [src] from the floor.")
 			else
 				user.visible_message("\The [user] begins securing \the [src] to the floor.", "You start securing \the [src] to the floor.")
 			if(do_after(user, 20 * W.toolspeed))
 				if(!src) return
-				user << "<span class='notice'>You [anchored? "un" : ""]secured \the [src]!</span>"
+				to_chat(user, "<span class='notice'>You [anchored? "un" : ""]secured \the [src]!</span>")
 				anchored = !anchored
 				return
 	else if(istype(W,/obj/item/weapon/packageWrap) || istype(W,/obj/item/weapon/weldingtool))
@@ -143,9 +143,9 @@
 		src.add_fingerprint(usr)
 		src.togglelock(usr)
 	else
-		usr << "<span class='warning'>This mob type can't use this verb.</span>"
+		to_chat(usr, "<span class='warning'>This mob type can't use this verb.</span>")

-/obj/structure/closet/secure_closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
+/obj/structure/closet/secure_closet/update_icon()//Putting the sealed stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
 	overlays.Cut()

 	if(!opened)
@@ -155,8 +155,8 @@
 			icon_state = icon_locked
 		else
 			icon_state = icon_closed
-		if(welded)
-			overlays += "welded"
+		if(sealed)
+			overlays += "sealed"
 	else
 		icon_state = icon_opened

@@ -98,7 +98,6 @@

 		for(var/line in lines)
 			for(var/beat in splittext(lowertext(line), ","))
-				//world << "beat: [beat]"
 				var/list/notes = splittext(beat, "/")
 				for(var/note in splittext(notes[1], "-"))
 					if(!playing || shouldStopPlaying(user))//If the instrument is playing, or special case
@@ -106,7 +105,6 @@
 						return
 					if(lentext(note) == 0)
 						continue
-					//world << "Parse: [copytext(note,1,2)]"
 					var/cur_note = text2ascii(note) - 96
 					if(cur_note < 1 || cur_note > 7)
 						continue
@@ -51,7 +51,7 @@
 	if(istype(spawnpoint) && den_mobs.len < max_creatures)
 		last_spawn = world.time
 		var/spawn_choice = pick(creature_types)
-		var/mob/living/L = new spawn_choice
+		var/mob/living/L = new spawn_choice(spawnpoint)
 		if(den_faction)
 			L.faction = den_faction
 		visible_message("<span class='warning'>\The [L] crawls out of \the [src].</span>")