Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master'

_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm

@@ -1,526 +1,56 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE 
-"a" = (
-/turf/closed/mineral/volcanic/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"b" = (
-/turf/closed/mineral/volcanic/lava_land_surface,
-/area/ruin/powered)
-"c" = (
-/turf/closed/wall/mineral/iron{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	},
-/area/ruin/powered)
-"d" = (
-/obj/item/clothing/head/helmet/space/orange,
-/obj/item/clothing/mask/breath,
-/turf/open/floor/plating/asteroid/basalt,
-/area/ruin/powered)
-"e" = (
-/obj/item/clothing/suit/space/orange,
-/turf/open/floor/plating/asteroid/basalt,
-/area/ruin/powered)
-"f" = (
-/turf/open/floor/plating/asteroid/basalt,
-/area/ruin/powered)
-"g" = (
-/turf/open/floor/plating/asteroid{
-	baseturf = /turf/open/floor/plating/asteroid/basalt;
-	name = "dirt"
-	},
-/area/ruin/powered)
-"h" = (
-/obj/item/weapon/shovel,
-/turf/open/floor/plating/asteroid{
-	baseturf = /turf/open/floor/plating/asteroid/basalt;
-	name = "dirt"
-	},
-/area/ruin/powered)
-"i" = (
-/obj/item/weapon/reagent_containers/glass/bucket,
-/turf/open/floor/plating/asteroid{
-	baseturf = /turf/open/floor/plating/asteroid/basalt;
-	name = "dirt"
-	},
-/area/ruin/powered)
-"j" = (
-/obj/structure/sink/puddle,
-/turf/open/floor/plating/asteroid{
-	baseturf = /turf/open/floor/plating/asteroid/basalt;
-	name = "dirt"
-	},
-/area/ruin/powered)
-"k" = (
-/obj/effect/glowshroom/single,
-/turf/open/floor/plating/asteroid{
-	baseturf = /turf/open/floor/plating/asteroid/basalt;
-	name = "dirt"
-	},
-/area/ruin/powered)
-"l" = (
-/obj/item/weapon/storage/toolbox/emergency,
-/turf/open/floor/plating/asteroid{
-	baseturf = /turf/open/floor/plating/asteroid/basalt;
-	name = "dirt"
-	},
-/area/ruin/powered)
-"m" = (
-/obj/structure/rack,
-/obj/item/seeds/reishi,
-/obj/item/seeds/plump,
-/obj/item/seeds/plump,
-/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom,
-/turf/open/floor/plating/asteroid/basalt,
-/area/ruin/powered)
-"n" = (
-/obj/machinery/hydroponics/soil,
-/turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	},
-/area/ruin/powered)
-"o" = (
-/turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	},
-/area/ruin/powered)
-"p" = (
-/obj/structure/rack,
-/obj/item/weapon/storage/bag/ore,
-/obj/item/weapon/storage/firstaid/regular,
-/turf/open/floor/plating/asteroid/basalt,
-/area/ruin/powered)
-"q" = (
-/obj/effect/glowshroom/single,
-/turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	},
-/area/ruin/powered)
-"r" = (
-/obj/structure/rack,
-/obj/item/weapon/pickaxe/emergency,
-/obj/item/weapon/tank/internals/oxygen,
-/turf/open/floor/plating/asteroid/basalt,
-/area/ruin/powered)
-"s" = (
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/lavaland/surface/outdoors)
-"t" = (
-/turf/closed/wall/shuttle/survival/pod{
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
-	},
-/area/ruin/powered)
-"u" = (
-/obj/structure/bed/pod,
-/obj/item/weapon/bedsheet/black,
-/turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	},
-/area/ruin/powered)
-"v" = (
-/obj/structure/fans,
-/turf/open/floor/pod/dark{
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
-	},
-/area/ruin/powered)
-"w" = (
-/obj/machinery/smartfridge/survival_pod,
-/turf/open/floor/pod/dark{
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
-	},
-/area/ruin/powered)
-"x" = (
-/obj/effect/mob_spawn/human/hermit,
-/turf/open/floor/pod/dark{
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
-	},
-/area/ruin/powered)
-"y" = (
-/turf/open/floor/pod/dark{
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
-	},
-/area/ruin/powered)
-"z" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/structure/tubes,
-/turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	},
-/area/ruin/powered)
-"A" = (
-/obj/structure/table,
-/obj/item/weapon/kitchen/knife/combat/survival,
-/turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
-	},
-/area/ruin/powered)
-"B" = (
-/obj/structure/table/survival_pod,
-/turf/open/floor/pod/dark{
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
-	},
-/area/ruin/powered)
-"C" = (
-/obj/structure/tubes,
-/obj/item/weapon/crowbar,
-/obj/effect/decal/cleanable/blood/drip,
-/turf/open/floor/pod/dark{
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
-	},
-/area/ruin/powered)
-"D" = (
-/obj/effect/decal/cleanable/blood/footprints{
-	tag = "icon-blood1 (NORTH)";
-	icon_state = "blood1";
-	dir = 1
-	},
-/obj/machinery/door/airlock/survival_pod,
-/obj/structure/fans/tiny,
-/turf/open/floor/pod/dark{
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
-	},
-/area/ruin/powered)
-"E" = (
-/obj/structure/shuttle/engine/propulsion/burst{
-	dir = 4
-	},
-/turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
-/area/ruin/powered)
-"F" = (
-/turf/closed/wall/shuttle{
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
-	dir = 2;
-	icon_state = "swall12"
-	},
-/area/ruin/powered)
-"G" = (
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/turf/closed/wall/shuttle{
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
-	dir = 2;
-	icon_state = "swall_f10";
-	layer = 2
-	},
-/area/ruin/powered)
-"H" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Escape Pod Airlock"
-	},
-/turf/open/floor/plasteel/shuttle,
-/area/ruin/powered)
-"I" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/turf/open/floor/plasteel/shuttle{
-	baseturf = /turf/open/floor/plating/asteroid/basalt
-	},
-/area/ruin/powered)
-"J" = (
-/obj/structure/grille,
-/obj/structure/window/shuttle,
-/turf/open/floor/plating{
-	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
-	initial_gas_mix = "o2=14;n2=23;TEMP=300"
-	},
-/area/ruin/powered)
-"K" = (
-/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/turf/closed/wall/shuttle{
-	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
-	dir = 2;
-	icon_state = "swall_f9"
-	},
-/area/ruin/powered)
+"a" = (/turf/closed/mineral/volcanic/lava_land_surface,/area/lavaland/surface/outdoors)
+"b" = (/turf/closed/mineral/volcanic/lava_land_surface,/area/ruin/powered)
+"c" = (/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/powered)
+"d" = (/obj/item/clothing/head/helmet/space/orange,/obj/item/clothing/mask/breath,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+"e" = (/obj/item/clothing/suit/space/orange,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+"f" = (/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+"g" = (/turf/open/floor/plating/asteroid{baseturf = /turf/open/floor/plating/asteroid/basalt; name = "dirt"},/area/ruin/powered)
+"h" = (/obj/item/weapon/shovel,/turf/open/floor/plating/asteroid{baseturf = /turf/open/floor/plating/asteroid/basalt; name = "dirt"},/area/ruin/powered)
+"i" = (/obj/item/weapon/reagent_containers/glass/bucket,/turf/open/floor/plating/asteroid{baseturf = /turf/open/floor/plating/asteroid/basalt; name = "dirt"},/area/ruin/powered)
+"j" = (/obj/structure/sink/puddle,/turf/open/floor/plating/asteroid{baseturf = /turf/open/floor/plating/asteroid/basalt; name = "dirt"},/area/ruin/powered)
+"k" = (/obj/effect/glowshroom/single,/turf/open/floor/plating/asteroid{baseturf = /turf/open/floor/plating/asteroid/basalt; name = "dirt"},/area/ruin/powered)
+"l" = (/obj/item/weapon/storage/toolbox/emergency,/turf/open/floor/plating/asteroid{baseturf = /turf/open/floor/plating/asteroid/basalt; name = "dirt"},/area/ruin/powered)
+"m" = (/obj/structure/rack,/obj/item/seeds/reishi,/obj/item/seeds/plump,/obj/item/seeds/plump,/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+"n" = (/obj/machinery/hydroponics/soil,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/powered)
+"o" = (/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/powered)
+"p" = (/obj/structure/rack,/obj/item/weapon/storage/bag/ore,/obj/item/weapon/storage/firstaid/regular,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+"q" = (/obj/effect/glowshroom/single,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/powered)
+"r" = (/obj/structure/rack,/obj/item/weapon/pickaxe/emergency,/obj/item/weapon/tank/internals/oxygen,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
+"s" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
+"t" = (/turf/closed/wall/shuttle/survival/pod{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
+"u" = (/obj/structure/bed/pod,/obj/item/weapon/bedsheet/black,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/powered)
+"v" = (/obj/structure/fans,/turf/open/floor/pod/dark{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
+"w" = (/obj/machinery/smartfridge/survival_pod,/turf/open/floor/pod/dark{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
+"x" = (/obj/effect/mob_spawn/human/hermit,/turf/open/floor/pod/dark{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
+"y" = (/turf/open/floor/pod/dark{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
+"z" = (/obj/machinery/light/small{dir = 4},/obj/structure/tubes,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/powered)
+"A" = (/obj/structure/table,/obj/item/weapon/kitchen/knife/combat/survival,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/powered)
+"B" = (/obj/structure/table/survival_pod,/obj/item/weapon/storage/bag/plants/portaseeder,/turf/open/floor/pod/dark{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
+"C" = (/obj/structure/tubes,/obj/item/weapon/crowbar,/obj/effect/decal/cleanable/blood/drip,/turf/open/floor/pod/dark{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
+"D" = (/obj/effect/decal/cleanable/blood/footprints{tag = "icon-blood1 (NORTH)"; icon_state = "blood1"; dir = 1},/obj/machinery/door/airlock/survival_pod,/obj/structure/fans/tiny,/turf/open/floor/pod/dark{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
+"E" = (/obj/structure/shuttle/engine/propulsion/burst{dir = 4},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered)
+"F" = (/turf/closed/wall/shuttle{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 2; icon_state = "swall12"},/area/ruin/powered)
+"G" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/turf/closed/wall/shuttle{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 2; icon_state = "swall_f10"; layer = 2},/area/ruin/powered)
+"H" = (/obj/machinery/door/airlock/shuttle{name = "Escape Pod Airlock"},/turf/open/floor/plasteel/shuttle,/area/ruin/powered)
+"I" = (/obj/structure/chair{dir = 4},/turf/open/floor/plasteel/shuttle{baseturf = /turf/open/floor/plating/asteroid/basalt},/area/ruin/powered)
+"J" = (/obj/structure/grille,/obj/structure/window/shuttle,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered)
+"K" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/turf/closed/wall/shuttle{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 2; icon_state = "swall_f9"},/area/ruin/powered)
 
 (1,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-s
-s
-s
-s
-s
-s
-s
-s
-"}
-(2,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-s
-s
-s
-s
-s
-s
-"}
-(3,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-s
-s
-s
-s
-s
-s
-"}
-(4,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-s
-s
-s
-s
-s
-"}
-(5,1,1) = {"
-a
-a
-a
-a
-a
-b
-c
-b
-t
-t
-t
-t
-t
-s
-s
-s
-"}
-(6,1,1) = {"
-a
-a
-a
-a
-b
-b
-n
-n
-t
-v
-x
-B
-t
-s
-s
-s
-"}
-(7,1,1) = {"
-a
-a
-a
-b
-b
-m
-o
-o
-t
-w
-y
-y
-D
-s
-s
-s
-"}
-(8,1,1) = {"
-a
-b
-b
-b
-c
-f
-o
-q
-o
-o
-z
-C
-t
-s
-s
-s
-"}
-(9,1,1) = {"
-b
-b
-f
-i
-g
-f
-f
-o
-o
-o
-t
-t
-t
-s
-s
-s
-"}
-(10,1,1) = {"
-b
-d
-g
-j
-g
-g
-f
-f
-u
-o
-A
-b
-a
-s
-s
-s
-"}
-(11,1,1) = {"
-c
-e
-h
-g
-l
-c
-p
-r
-c
-c
-c
-b
-a
-a
-s
-s
-"}
-(12,1,1) = {"
-b
-b
-f
-k
-f
-b
-b
-b
-b
-a
-a
-a
-a
-E
-H
-E
-"}
-(13,1,1) = {"
-a
-b
-b
-b
-b
-b
-a
-a
-a
-a
-a
-a
-a
-F
-I
-F
-"}
-(14,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-F
-I
-F
-"}
-(15,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-G
-J
-K
-"}
-(16,1,1) = {"
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
-a
+aaaaaaaabbcbaaaa
+aaaaaaabbdebbaaa
+aaaaaaabfghfbaaa
+aaaaaabbijgkbaaa
+aaaaabbcgglfbaaa
+aaaabbmffgcbbaaa
+aaaacnooffpbaaaa
+aaaabnoqofrbaaaa
+saaatttooucbaaaa
+saaatvwooocaaaaa
+sssatxyztAcaaaaa
+sssstByCtbbaaaaa
+ssssttDttaaaaaaa
+ssssssssssaEFFGa
+sssssssssssHIIJa
+sssssssssssEFFKa
 "}

_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_egg.dmm

@@ -0,0 +1,16 @@
+"a" = (/turf/template_noop,/area/template_noop)
+"b" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/template_noop)
+"c" = (/obj/structure/alien/weeds,/obj/structure/alien/resin/wall,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/awaycontent/a7{name = "The Egg"})
+"d" = (/obj/structure/alien/weeds,/obj/structure/alien/egg,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/awaycontent/a7{name = "The Egg"})
+
+(1,1,1) = {"
+aabbbbbaa
+abbcccbba
+bbcccccbb
+bcccdcccb
+bccdddccb
+bcccdcccb
+bbcccccbb
+abbcccbba
+aabbbbbaa
+"}

cfg/admin.txt

@@ -7,10 +7,3 @@
 # they will be able to right-click the top of the client to access these options. #                                                                                        #
 # Case is not important for ckey.                                                 #
 ###################################################################################
-aranclanos
-cheridan
-giacomand
-rockdtben
-MrStonedOne
-Jordie0608
-Dunc

code/__HELPERS/lists.dm

@@ -67,6 +67,14 @@
 		return 0
 	return L[A.type]
 
+//returns a new list with only atoms that are in typecache L
+/proc/typecache_filter_list(list/atoms, list/typecache)
+	. = list()
+	for (var/thing in atoms)
+		var/atom/A = thing
+		if (typecache[A.type])
+			. += A
+
 //Like typesof() or subtypesof(), but returns a typecache instead of a list
 /proc/typecacheof(path, ignore_root_path)
 	if(ispath(path))

code/__HELPERS/unsorted.dm

@@ -543,7 +543,8 @@ Turf and target are seperate in case you want to teleport some distance from a t
 				return 0
 			if(current.opacity)
 				return 0
-			for(var/atom/A in current)
+			for(var/thing in current)
+				var/atom/A = thing
 				if(A.opacity)
 					return 0
 			current = get_step_towards(current, target_turf)

code/game/objects/items/weapons/tools.dm

@@ -466,6 +466,7 @@
 	max_fuel = 80
 	materials = list(MAT_METAL=70, MAT_GLASS=120)
 	origin_tech = "engineering=3;plasmatech=2"
+	w_class = 3
 
 /obj/item/weapon/weldingtool/experimental
 	name = "experimental welding tool"

code/game/verbs/looc.dm

@@ -0,0 +1,79 @@
+/client/verb/looc(msg as text)
+	set name = "LOOC"
+	set desc = "Local OOC, seen only by those in view."
+	set category = "OOC"
+
+	if(say_disabled)	//This is here to try to identify lag problems
+		usr << "\red Speech is currently admin-disabled."
+		return
+
+	if(!mob)	return
+	if(IsGuestKey(key))
+		src << "Guests may not use OOC."
+		return
+
+	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
+	if(!msg)	return
+
+	if(!(prefs.toggles & CHAT_OOC))
+		src << "\red You have OOC muted."
+		return
+
+	if(!holder)
+		if(!ooc_allowed)
+			src << "\red OOC is globally muted"
+			return
+		if(!dooc_allowed && (mob.stat == DEAD))
+			usr << "\red OOC for dead mobs has been turned off."
+			return
+		if(prefs.muted & MUTE_OOC)
+			src << "\red You cannot use OOC (muted)."
+			return
+		if(handle_spam_prevention(msg,MUTE_OOC))
+			return
+		if(findtext(msg, "byond://"))
+			src << "<B>Advertising other servers is not allowed.</B>"
+			log_admin("[key_name(src)] has attempted to advertise in LOOC: [msg]")
+			return
+
+	log_ooc("(LOCAL) [mob.name]/[key] : [msg]")
+
+	var/list/heard = get_hearers_in_view(7, get_top_level_mob(src.mob))
+	for(var/mob/M in heard)
+		if(!M.client)
+			continue
+		var/client/C = M.client
+		if (C in admins)
+			continue //they are handled after that
+
+		if (istype(M,/mob/dead/observer))
+			continue //Also handled later.
+
+		if(C.prefs.toggles & CHAT_OOC)
+//			var/display_name = src.key
+//			if(holder)
+//				if(holder.fakekey)
+//					if(C.holder)
+//						display_name = "[holder.fakekey]/([src.key])"
+//				else
+//					display_name = holder.fakekey
+			C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>LOOC:</span> <EM>[src.mob.name]:</EM> <span class='message'>[msg]</span></span></font>"
+
+	for(var/client/C in admins)
+		if(C.prefs.toggles & CHAT_OOC)
+			var/prefix = "(R)LOOC"
+			if (C.mob in heard)
+				prefix = "LOOC"
+			C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>[prefix]:</span> <EM>[src.key]/[src.mob.name]:</EM> <span class='message'>[msg]</span></span></font>"
+
+	for(var/mob/dead/observer/G in world)
+		if(!G.client)
+			continue
+		var/client/C = G.client
+		if (C in admins)
+			continue //handled earlier.
+		if(C.prefs.toggles & CHAT_OOC)
+			var/prefix = "(G)LOOC"
+			if (C.mob in heard)
+				prefix = "LOOC"
+			C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>[prefix]:</span> <EM>[src.key]/[src.mob.name]:</EM> <span class='message'>[msg]</span></span></font>"

code/modules/client/preferences.dm

@@ -1287,6 +1287,7 @@ var/list/preferences_datums = list()
 
 	character.real_name = real_name
 	character.name = character.real_name
+	character.flavor_text = flavor_text
 
 	character.gender = gender
 	character.age = age
@@ -1301,7 +1302,6 @@ var/list/preferences_datums = list()
 	character.underwear = underwear
 	character.undershirt = undershirt
 	character.socks = socks
-
 	character.backbag = backbag
 
 	character.dna.features = features.Copy()

code/modules/client/preferences_savefile.dm

@@ -310,7 +310,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		S["features["mcolor3"]"]	<< "#FFF"
 
 	//Character
-	S["Flavor_Text"]					>> flavor_text
 	S["real_name"]						>> real_name
 	S["name_is_always_random"]  		>> be_random_name
 	S["body_is_always_random"]  		>> be_random_body
@@ -326,6 +325,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["undershirt"]						>> undershirt
 	S["socks"]							>> socks
 	S["backbag"]						>> backbag
+	S["flavor_text"]					>> flavor_text
 	S["feature_mcolor"]					>> features["mcolor"]
 	S["feature_mcolor2"]				>> features["mcolor2"]
 	S["feature_mcolor3"]				>> features["mcolor3"]
@@ -438,24 +438,26 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["version"]			<< SAVEFILE_VERSION_MAX	//load_character will sanitize any bad data, so assume up-to-date.
 
 	//Character
-	S["Flavor_Text"]			>> flavor_text
-	S["real_name"]			<< real_name
-	S["name_is_always_random"] << be_random_name
-	S["body_is_always_random"] << be_random_body
-	S["gender"]				<< gender
-	S["age"]				<< age
-	S["hair_color"]			<< hair_color
-	S["facial_hair_color"]	<< facial_hair_color
-	S["eye_color"]			<< eye_color
-	S["skin_tone"]			<< skin_tone
-	S["hair_style_name"]	<< hair_style
-	S["facial_style_name"]	<< facial_hair_style
-	S["underwear"]			<< underwear
-	S["undershirt"]			<< undershirt
-	S["socks"]				<< socks
-	S["backbag"]			<< backbag
-	S["species"]			<< pref_species.id
+	S["real_name"]				<< real_name
+	S["name_is_always_random"]  << be_random_name
+	S["body_is_always_random"]  << be_random_body
+	S["gender"]					<< gender
+	S["age"]					<< age
+	S["hair_color"]				<< hair_color
+	S["facial_hair_color"]		<< facial_hair_color
+	S["eye_color"]				<< eye_color
+	S["skin_tone"]				<< skin_tone
+	S["hair_style_name"]		<< hair_style
+	S["facial_style_name"]		<< facial_hair_style
+	S["underwear"]				<< underwear
+	S["undershirt"]				<< undershirt
+	S["socks"]					<< socks
+	S["backbag"]				<< backbag
+	S["flavor_text"]			<< flavor_text
+	S["species"]				<< pref_species.id
 	S["feature_mcolor"]					<< features["mcolor"]
+	S["feature_mcolor2"]				<< features["mcolor2"]
+	S["feature_mcolor3"]				<< features["mcolor3"]
 	S["feature_lizard_tail"]			<< features["tail_lizard"]
 	S["feature_human_tail"]				<< features["tail_human"]
 	S["feature_lizard_snout"]			<< features["snout"]

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

@@ -382,6 +382,8 @@
 				src << "<span class='warning'>You feel your [pocket_side] pocket being fumbled with!</span>"
 
 		..()
+	else
+		..()
 
 
 ///////HUDs///////

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

@@ -87,14 +87,16 @@
 	if(!search_objects)
 		var/list/Mobs = hearers(vision_range, targets_from) - src //Remove self, so we don't suicide
 		. += Mobs
-		for(var/M in mechas_list)
-			if(get_dist(M, targets_from) <= vision_range && can_see(targets_from, M, vision_range))
-				. += M
+
+		var/static/hostile_machines = typecacheof(list(/obj/machinery/porta_turret, /obj/mecha))
+
+		for(var/HM in typecache_filter_list(range(vision_range, targets_from), hostile_machines))
+			if(can_see(targets_from, HM, vision_range))
+				. += HM
 	else
 		var/list/Objects = oview(vision_range, targets_from)
 		. += Objects
 
-
 /mob/living/simple_animal/hostile/proc/FindTarget(var/list/possible_targets, var/HasTargetsList = 0)//Step 2, filter down possible targets to things we actually care about
 	. = list()
 	if(!HasTargetsList)

code/modules/mob/mob.dm

@@ -467,7 +467,7 @@ proc/get_top_level_mob(var/mob/S)
 		src << "<span class='alert'>Your flavor text is likely out of date! <a href='byond://?src=\ref[src];flavor_change=1'>Change</a></span>"
 
 /mob/proc/print_flavor_text()
-	if (flavor_text && flavor_text != "")
+	if(flavor_text && flavor_text != "")
 		var/msg = replacetext(flavor_text, "\n", " ")
 		if(lentext(msg) <= 40)
 			return "\blue [msg]"

code/modules/reagents/kegs.dm

@@ -0,0 +1,42 @@
+/obj/structure/reagent_dispensers/keg
+	name = "keg"
+	desc = "A keg."
+	icon_state = "keg"
+	var/reagent_type = "water"
+
+/obj/structure/reagent_dispensers/keg/New()
+	..()
+	reagents.add_reagent(reagent_type,1000)
+
+/obj/structure/reagent_dispensers/keg/blob_act()
+	qdel(src)
+
+/obj/structure/reagent_dispensers/keg/mead
+	name = "keg of mead"
+	desc = "A keg of mead."
+	icon_state = "orangekeg"
+	reagent_type = "mead"
+
+/obj/structure/reagent_dispensers/keg/aphro
+	name = "keg of aphrodisiac"
+	desc = "A keg of aphrodisiac."
+	icon_state = "pinkkeg"
+	reagent_type = "hornychem"
+
+/obj/structure/reagent_dispensers/keg/milk
+	name = "keg of milk"
+	desc = "It's not quite what you were hoping for."
+	icon_state = "whitekeg"
+	reagent_type = "milk"
+
+/obj/structure/reagent_dispensers/keg/semen
+	name = "keg of semen"
+	desc = "Dear lord, where did this even come from?"
+	icon_state = "whitekeg"
+	reagent_type = "semen"
+
+/obj/structure/reagent_dispensers/keg/gargle
+	name = "keg of pan galactic gargleblaster"
+	desc = "A keg of... wow that's a long name."
+	icon_state = "bluekeg"
+	reagent_type = "gargleblaster"