Merge branch 'master' into upstream-merge-30218

2017-08-29 20:15:47 -07:00
parent 2b5d584c67 0b82132443
commit 705427f05d
250 changed files with 1261 additions and 4586 deletions
@@ -1,15 +0,0 @@
-diff a/SQL/database_changelog.txt b/SQL/database_changelog.txt	(rejected hunks)
-@@ -1,10 +1,10 @@
- Any time you make a change to the schema files, remember to increment the database schema version. Generally increment the minor number, major should be reserved for significant changes to the schema. Both values go up to 255.
- 
-The latest database version is 3.1; The query to update the schema revision table is:
-+The latest database version is 3.0; The query to update the schema revision table is:
- 
-UPDATE `schema_revision` SET major = 3, minor = 1 LIMIT 1;
-+INSERT INTO `schema_revision` (`major`, `minor`) VALUES (3, 0);
- or
-UPDATE `SS13_schema_revision` SET major = 3, minor = 1 LIMIT 1;
-+INSERT INTO `SS13_schema_revision` (`major`, `minor`) VALUES (3, 0);
- 
- ----------------------------------------------------
- 
@@ -1,10 +0,0 @@
-diff a/_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm	(rejected hunks)
-@@ -269,7 +269,7 @@
- "W" = (
- /obj/structure/alien/weeds,
- /obj/structure/alien/resin/wall,
-/obj/effect/baseturf_helper,
-+/obj/effect/baseturf_helper/lava_land/surface,
- /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
- /area/ruin/unpowered/xenonest)
- 
@@ -1,9 +0,0 @@
-diff a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm	(rejected hunks)
-@@ -9,6 +9,7 @@
- #define INVESTIGATE_SUPERMATTER      "supermatter"
- #define INVESTIGATE_TELESCI          "telesci"
- #define INVESTIGATE_WIRES            "wires"
-+#define INVESTIGATE_HALLUCINATIONS   "hallucinations"
- 
- //Individual logging defines
- #define INDIVIDUAL_ATTACK_LOG   "Attack log"
@@ -1,62 +0,0 @@
-diff a/code/datums/callback.dm b/code/datums/callback.dm	(rejected hunks)
-@@ -100,60 +100,3 @@
- 	if (object == GLOBAL_PROC)
- 		return call(delegate)(arglist(calling_arguments))
- 	return call(object, delegate)(arglist(calling_arguments))
-
-
-/datum/callback_select
-	var/list/finished
-	var/pendingcount
-	var/total
-
-/datum/callback_select/New(count, savereturns)
-	total = count
-	if (savereturns)
-		finished = new(count)
-
-
-/datum/callback_select/proc/invoke_callback(index, datum/callback/callback, list/callback_args, savereturn = TRUE)
-	set waitfor = FALSE
-	if (!callback || !istype(callback))
-		//This check only exists because the alternative is callback_select would block forever if given invalid data
-		CRASH("invalid callback passed to invoke_callback")
-	if (!length(callback_args))
-		callback_args = list()
-	pendingcount++
-	debug_usr("calling callback")
-	var/rtn = callback.Invoke(arglist(callback_args))
-	debug_usr("callback returned")
-	pendingcount--
-	if (savereturn)
-		finished[index] = rtn
-
-
-
-
-//runs a list of callbacks asynchronously, returning once all of them return.
-//callbacks can be repeated.
-//callbacks-args is a optional list of argument lists, in the same order as the callbacks,
-//	the inner lists will be sent to the callbacks when invoked() as additional args.
-//can optionly save and return a list of return values, in the same order as the original list of callbacks
-//resolution is the number of byond ticks between checks.
-/proc/callback_select(list/callbacks, list/callback_args, savereturns = TRUE, resolution = 1)
-	if (!callbacks)
-		return
-	var/count = length(callbacks)
-	if (!count)
-		return
-	if (!callback_args)
-		callback_args = list()
-
-	callback_args.len = count
-
-	var/datum/callback_select/CS = new(count, savereturns)
-	for (var/i in 1 to count)
-		CS.invoke_callback(i, callbacks[i], callback_args[i], savereturns)
-	debug_usr("starting callbacks: [CS.pendingcount]")
-	while(CS.pendingcount)
-		debug_usr("callbacks: [CS.pendingcount]")
-		sleep(resolution*world.tick_lag)
-	return CS.finished
-
@@ -56,7 +56,7 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
 1. `GET_COMPONENT(varname, component_type)` OR `GET_COMPONENT_FROM(varname, component_type, src)`
    * Shorthand for `var/component_type/varname = src.GetComponent(component_type)`
 1. `/datum/proc/AddComponent(component_type(type), ...) -> datum/component`  (public, final)
-    * Creates an instance of `component_type` in the datum and passes `...` to it's `New()` call
+    * Creates an instance of `component_type` in the datum and passes `...` to its `Initialize()` call
    * Sends the `COMSIG_COMPONENT_ADDED` signal to the datum
    * All components a datum owns are deleted with the datum
    * Returns the component that was created. Or the old component in a dupe situation where `COMPONENT_DUPE_UNIQUE` was set
@@ -1 +0,0 @@
-
@@ -1,10 +0,0 @@
-diff a/code/datums/riding.dm b/code/datums/riding.dm	(rejected hunks)
-@@ -419,7 +419,7 @@
- 	icon = 'icons/obj/items_and_weapons.dmi.dmi'
- 	icon_state = "offhand"
- 	w_class = WEIGHT_CLASS_HUGE
-	flags = ABSTRACT | DROPDEL | NOBLUDGEON
-+	flags_1 = ABSTRACT_1 | DROPDEL_1 | NOBLUDGEON_1
- 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
- 	var/mob/living/carbon/rider
- 	var/mob/living/ridden
@@ -1,29 +0,0 @@
-diff a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm	(rejected hunks)
-@@ -535,15 +535,15 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
- /area/crew_quarters/toilet/fitness
- 	name = "Fitness Toilets"
- 	icon_state = "toilet"
-	
-+
- /area/crew_quarters/toilet/female
- 	name = "Female Toilets"
- 	icon_state = "toilet"
-	
-+
- /area/crew_quarters/toilet/male
- 	name = "Male Toilets"
- 	icon_state = "toilet"
-	
-+
- /area/crew_quarters/toilet/restrooms
- 	name = "Restrooms"
- 	icon_state = "toilet"
-@@ -1009,7 +1009,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
- 
- /area/security/execution/transfer
- 	name = "Transfer Centre"
-	
-+
- /area/security/execution/education
- 	name = "Prisoner Education Chamber"
- 
@@ -1,10 +0,0 @@
-diff a/code/game/area/areas.dm b/code/game/area/areas.dm	(rejected hunks)
-@@ -432,7 +432,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
- 	// Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch
- 	if(L.client && !L.client.ambience_playing && L.client.prefs.toggles & SOUND_SHIP_AMBIENCE)
- 		L.client.ambience_playing = 1
-		L << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = CHANNEL_BUZZ)
-+		SEND_SOUND(L, sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = CHANNEL_BUZZ))
- 
- 	if(!(L.client && (L.client.prefs.toggles & SOUND_AMBIENCE)))
- 		return //General ambience check is below the ship ambience so one can play without the other
@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm	(rejected hunks)
-@@ -175,7 +175,7 @@
- 		SEND_SOUND(blobber, sound('sound/effects/attackblob.ogg'))
- 		to_chat(blobber, "<b>You are a blobbernaut!</b>")
- 		to_chat(blobber, "You are powerful, hard to kill, and slowly regenerate near nodes and cores, but will slowly die if not near the blob or if the factory that made you is killed.")
-		to_chat(blobber, "You can communicate with other blobbernauts and GLOB.overminds via <b>:b</b>")
-+		to_chat(blobber, "You can communicate with other blobbernauts and overminds via <b>:b</b>")
- 		to_chat(blobber, "Your overmind's blob reagent is: <b><font color=\"[blob_reagent_datum.color]\">[blob_reagent_datum.name]</b></font>!")
- 		to_chat(blobber, "The <b><font color=\"[blob_reagent_datum.color]\">[blob_reagent_datum.name]</b></font> reagent [blob_reagent_datum.shortdesc ? "[blob_reagent_datum.shortdesc]" : "[blob_reagent_datum.description]"]")
- 	if(blobber)
@@ -1,19 +0,0 @@
-diff a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm	(rejected hunks)
-@@ -395,7 +395,7 @@
- /obj/item/shield/changeling
- 	name = "shield-like mass"
- 	desc = "A mass of tough, boney tissue. You can still see the fingers as a twisted pattern in the shield."
-	flags = ABSTRACT | NODROP | DROPDEL
-+	flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
- 	icon = 'icons/obj/items_and_weapons.dmi'
- 	icon_state = "ling_shield"
- 	lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
-@@ -443,7 +443,7 @@
- 	name = "flesh mass"
- 	icon_state = "lingspacesuit"
- 	desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel."
-	flags = STOPSPRESSUREDMAGE | NODROP | DROPDEL //Not THICKMATERIAL because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff)
-+	flags_1 = STOPSPRESSUREDMAGE_1 | NODROP_1 | DROPDEL_1 //Not THICKMATERIAL_1 because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff)
- 	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/oxygen)
- 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 90, acid = 90) //No armor at all.
- 
@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/clock_cult/clock_items/ratvarian_spear.dm b/code/game/gamemodes/clock_cult/clock_items/ratvarian_spear.dm	(rejected hunks)
-@@ -6,6 +6,8 @@
- 	icon = 'icons/obj/clockwork_objects.dmi'
- 	icon_state = "ratvarian_spear"
- 	item_state = "ratvarian_spear"
-+	lefthand_file = 'icons/mob/inhands/antag/clockwork_lefthand.dmi'
-+	righthand_file = 'icons/mob/inhands/antag/clockwork_righthand.dmi'
- 	force = 15 //Extra damage is dealt to targets in attack()
- 	throwforce = 25
- 	armour_penetration = 10
@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm	(rejected hunks)
-@@ -31,7 +31,7 @@
- /obj/item/melee/cultblade/ghost
- 	name = "eldritch sword"
- 	force = 19 //can't break normal airlocks
-	flags = NODROP|DROPDEL
-+	flags_1 = NODROP_1|DROPDEL_1
- 
- /obj/item/melee/cultblade/pickup(mob/living/user)
- 	..()
@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm	(rejected hunks)
-@@ -343,7 +343,7 @@
- 	desc = "Shackles that bind the wrists with sinister magic."
- 	trashtype = /obj/item/restraints/handcuffs/energy/used
- 	origin_tech = "materials=2;magnets=5"
-	flags = DROPDEL
-+	flags_1 = DROPDEL_1
- 
- /obj/item/restraints/handcuffs/energy/cult/used/dropped(mob/user)
- 	user.visible_message("<span class='danger'>[user]'s shackles shatter in a discharge of dark magic!</span>", \
@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm	(rejected hunks)
-@@ -499,7 +499,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
- 
- /obj/item/restraints/handcuffs/energy/used
- 	desc = "energy discharge"
-	flags = DROPDEL
-+	flags_1 = DROPDEL_1
- 
- /obj/item/restraints/handcuffs/energy/used/dropped(mob/user)
- 	user.visible_message("<span class='danger'>[user]'s [src] break in a discharge of energy!</span>", \
@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm	(rejected hunks)
-@@ -23,7 +23,7 @@
- 		var/obj/item/clothing/suit/armor/abductor/vest/V = locate() in H
- 		if(V)
- 			console.AddVest(V)
-			V.flags |= NODROP
-+			V.flags_1 |= NODROP_1
- 
- 		var/obj/item/storage/backpack/B = locate() in H
- 		if(B)
@@ -1,10 +0,0 @@
-diff a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm	(rejected hunks)
-@@ -136,7 +136,7 @@
- 
- 
- /obj/structure/frame/computer/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
-+	if(!(flags_1 & NODECONSTRUCT_1))
- 		if(state == 4)
- 			new /obj/item/shard(loc)
- 			new /obj/item/shard(loc)
@@ -1,10 +0,0 @@
-diff a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm	(rejected hunks)
-@@ -163,7 +163,7 @@
- 	else if(istype(I, /obj/item/weldingtool))
- 		try_to_weld(I, user)
- 		return 1
-	else if(!(I.flags & NOBLUDGEON) && user.a_intent != INTENT_HARM)
-+	else if(!(I.flags_1 & NOBLUDGEON_1) && user.a_intent != INTENT_HARM)
- 		try_to_activate_door(user)
- 		return 1
- 	return ..()
@@ -1,19 +0,0 @@
-diff a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm	(rejected hunks)
-@@ -11,7 +11,7 @@
- 	integrity_failure = 0
- 	armor = list(melee = 20, bullet = 50, laser = 50, energy = 50, bomb = 10, bio = 100, rad = 100, fire = 70, acid = 100)
- 	visible = FALSE
-	flags = ON_BORDER
-+	flags_1 = ON_BORDER_1
- 	opacity = 0
- 	CanAtmosPass = ATMOS_PASS_PROC
- 	var/obj/item/electronics/airlock/electronics = null
-@@ -221,7 +221,7 @@
- 		return
- 
- 	add_fingerprint(user)
-	if(!(flags&NODECONSTRUCT))
-+	if(!(flags_1&NODECONSTRUCT_1))
- 		if(istype(I, /obj/item/screwdriver))
- 			if(density || operating)
- 				to_chat(user, "<span class='warning'>You need to open the door to access the maintenance panel!</span>")
@@ -1,16 +0,0 @@
-diff a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm	(rejected hunks)
-@@ -239,12 +239,12 @@
- 				alarm()
- 
- /obj/machinery/firealarm/obj_break(damage_flag)
-	if(!(stat & BROKEN) && !(flags & NODECONSTRUCT) && buildstage != 0) //can't break the electronics if there isn't any inside.
-+	if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1) && buildstage != 0) //can't break the electronics if there isn't any inside.
- 		stat |= BROKEN
- 		update_icon()
- 
- /obj/machinery/firealarm/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
-+	if(!(flags_1 & NODECONSTRUCT_1))
- 		new /obj/item/stack/sheet/metal(loc, 1)
- 		if(!(stat & BROKEN))
- 			var/obj/item/I = new /obj/item/electronics/firealarm(loc)
@@ -1,10 +0,0 @@
-diff a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm	(rejected hunks)
-@@ -15,7 +15,7 @@
- 									/obj/item/reagent_containers/glass)
- 
- /obj/machinery/iv_drip/Initialize()
-	..()
-+	. = ..()
- 	update_icon()
- 	drip_containers = typecacheof(drip_containers)
- 
@@ -1,10 +0,0 @@
-diff a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm	(rejected hunks)
-@@ -10,7 +10,7 @@
- 	icon = 'icons/obj/machines/limbgrower.dmi'
- 	icon_state = "limbgrower_idleoff"
- 	density = TRUE
-	container_type = OPENCONTAINER
-+	container_type = OPENCONTAINER_1
- 	anchored = TRUE
- 	use_power = IDLE_POWER_USE
- 	idle_power_usage = 10
@@ -1,18 +0,0 @@
-diff a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm	(rejected hunks)
-@@ -758,14 +758,14 @@ GLOBAL_LIST_EMPTY(allCasters)
- 
- 
- /obj/machinery/newscaster/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
-+	if(!(flags_1 & NODECONSTRUCT_1))
- 		new /obj/item/stack/sheet/metal(loc, 2)
- 		new /obj/item/shard(loc)
- 		new /obj/item/shard(loc)
- 	qdel(src)
- 
- /obj/machinery/newscaster/obj_break()
-	if(!(stat & BROKEN) && !(flags & NODECONSTRUCT))
-+	if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
- 		stat |= BROKEN
- 		playsound(loc, 'sound/effects/glassbr3.ogg', 100, 1)
- 		update_icon()
@@ -1,10 +0,0 @@
-diff a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm	(rejected hunks)
-@@ -664,7 +659,7 @@
- 	return ..()
- 
- /obj/machinery/turretid/Initialize(mapload) //map-placed turrets autolink turrets
-	..()
-+	. = ..()
- 	if(!mapload)
- 		return
- 
@@ -1,10 +0,0 @@
-diff a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm	(rejected hunks)
-@@ -187,7 +187,7 @@
- 	name = "dangerous old crusher"
- 	emagged = TRUE
- 	crush_damage = 120
-	flags = NODECONSTRUCT
-+	flags_1 = NODECONSTRUCT_1
- 
- /obj/item/paper/guides/recycler
- 	name = "paper - 'garbage duty instructions'"
@@ -1,10 +0,0 @@
-diff a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm	(rejected hunks)
-@@ -12,7 +12,7 @@
- 
- /obj/structure/emergency_shield/Initialize()
- 	. = ..()
-	setDir(pick(1,2,3,4))
-+	setDir(pick(GLOB.cardinals))
- 	air_update_turf(1)
- 
- /obj/structure/emergency_shield/Destroy()
@@ -1,10 +0,0 @@
-diff a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm	(rejected hunks)
-@@ -130,7 +130,7 @@
- 		new /datum/hallucination/delusion(victim, TRUE, "demon",duration,0)
- 
- 	var/obj/item/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc)
-	chainsaw.flags |= NODROP
-+	chainsaw.flags_1 |= NODROP_1
- 	victim.drop_all_held_items()
- 	victim.put_in_hands(chainsaw)
- 	chainsaw.attack_self(victim)
@@ -1,10 +0,0 @@
-diff a/code/game/objects/items.dm b/code/game/objects/items.dm	(rejected hunks)
-@@ -135,7 +135,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
- 			hitsound = "swing_hit"
- 
- /obj/item/Destroy()
-	flags &= ~DROPDEL	//prevent reqdels
-+	flags_1 &= ~DROPDEL_1	//prevent reqdels
- 	if(ismob(loc))
- 		var/mob/m = loc
- 		m.temporarilyRemoveItemFromInventory(src, TRUE)
@@ -1,10 +0,0 @@
-diff a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm	(rejected hunks)
-@@ -151,7 +151,7 @@
- /obj/item/borg/charger
- 	name = "power connector"
- 	icon_state = "charger_draw"
-	flags = NOBLUDGEON
-+	flags_1 = NOBLUDGEON_1
- 	var/mode = "draw"
- 	var/static/list/charge_machines = typecacheof(list(/obj/machinery/cell_charger, /obj/machinery/recharger, /obj/machinery/recharge_station, /obj/machinery/mech_bay_recharge_port))
- 	var/static/list/charge_items = typecacheof(list(/obj/item/stock_parts/cell, /obj/item/gun/energy))
@@ -1,19 +0,0 @@
-diff a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm	(rejected hunks)
-@@ -9,7 +9,7 @@
- 	desc = "Wrap packages with this festive paper to make gifts."
- 	icon = 'icons/obj/items_and_weapons.dmi'
- 	icon_state = "wrap_paper"
-	flags = NOBLUDGEON
-+	flags_1 = NOBLUDGEON_1
- 	amount = 25
- 	max_amount = 25
- 	resistance_flags = FLAMMABLE
-@@ -30,7 +30,7 @@
- 	desc = "You can use this to wrap items in."
- 	icon = 'icons/obj/items_and_weapons.dmi'
- 	icon_state = "deliveryPaper"
-	flags = NOBLUDGEON
-+	flags_1 = NOBLUDGEON_1
- 	amount = 25
- 	max_amount = 25
- 	resistance_flags = FLAMMABLE
@@ -0,0 +1,9 @@
+diff a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm	(rejected hunks)
+@@ -732,7 +732,6 @@
+ /obj/item/storage/box/ingredients //This box is for the randomely chosen version the chef spawns with, it shouldn't actually exist.
+ 	name = "ingredients box"
+ 	illustration = "donk_kit"
+-	icon_state = null
+ 
+ /obj/item/storage/box/ingredients/Initialize()
+ 	..()
@@ -1,12 +0,0 @@
-diff a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm	(rejected hunks)
-@@ -244,8 +244,8 @@
- // Copied from /obj/item/melee/transforming/energy/sword/attackby
- /obj/item/toy/sword/attackby(obj/item/W, mob/living/user, params)
- 	if(istype(W, /obj/item/toy/sword))
-		if((W.flags & NODROP) || (flags & NODROP))
-			to_chat(user, "<span class='warning'>\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!</span>")
-+		if((W.flags_1 & NODROP_1) || (flags_1 & NODROP_1))
-+			to_chat(user, "<span class='warning'>\the [flags_1 & NODROP_1 ? src : W] is stuck to your hand, you can't attach it to \the [flags_1 & NODROP_1 ? W : src]!</span>")
- 			return
- 		else
- 			to_chat(user, "<span class='notice'>You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool.</span>")
@@ -1,10 +0,0 @@
-diff a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm	(rejected hunks)
-@@ -31,7 +31,7 @@
- 	return attack_hand(user)
- 
- /obj/structure/bed/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/wrench) && !(flags&NODECONSTRUCT))
-+	if(istype(W, /obj/item/wrench) && !(flags_1&NODECONSTRUCT_1))
- 		playsound(src.loc, W.usesound, 50, 1)
- 		deconstruct(TRUE)
- 	else
@@ -1,10 +0,0 @@
-diff a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm	(rejected hunks)
-@@ -41,7 +41,7 @@
- 	qdel(src)
- 
- /obj/structure/chair/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/wrench) && !(flags&NODECONSTRUCT))
-+	if(istype(W, /obj/item/wrench) && !(flags_1&NODECONSTRUCT_1))
- 		playsound(src.loc, W.usesound, 50, 1)
- 		deconstruct()
- 	else if(istype(W, /obj/item/assembly/shock_kit))
@@ -1,16 +0,0 @@
-diff a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm	(rejected hunks)
-@@ -193,12 +193,12 @@
- 		return open(user)
- 
- /obj/structure/closet/deconstruct(disassembled = TRUE)
-	if(ispath(material_drop) && material_drop_amount && !(flags & NODECONSTRUCT))
-+	if(ispath(material_drop) && material_drop_amount && !(flags_1 & NODECONSTRUCT_1))
- 		new material_drop(loc, material_drop_amount)
- 	qdel(src)
- 
- /obj/structure/closet/obj_break(damage_flag)
-	if(!broken && !(flags & NODECONSTRUCT))
-+	if(!broken && !(flags_1 & NODECONSTRUCT_1))
- 		bust_open()
- 
- /obj/structure/closet/attackby(obj/item/W, mob/user, params)
@@ -1,19 +0,0 @@
-diff a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm	(rejected hunks)
-@@ -50,7 +50,7 @@
- 			playsound(src.loc, 'sound/items/welder.ogg', 100, 1)
- 
- /obj/structure/displaycase/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
-+	if(!(flags_1 & NODECONSTRUCT_1))
- 		dump()
- 		if(!disassembled)
- 			new /obj/item/shard( src.loc )
-@@ -58,7 +58,7 @@
- 	qdel(src)
- 
- /obj/structure/displaycase/obj_break(damage_flag)
-	if(!broken && !(flags & NODECONSTRUCT))
-+	if(!broken && !(flags_1 & NODECONSTRUCT_1))
- 		density = FALSE
- 		broken = 1
- 		new /obj/item/shard( src.loc )
@@ -1,10 +0,0 @@
-diff a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm	(rejected hunks)
-@@ -91,7 +91,7 @@
- 		new /obj/item/shard(loc)
- 
- /obj/structure/fireaxecabinet/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
-+	if(!(flags_1 & NODECONSTRUCT_1))
- 		if(fireaxe && loc)
- 			fireaxe.forceMove(loc)
- 			fireaxe = null
@@ -1,10 +0,0 @@
-diff a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm	(rejected hunks)
-@@ -13,7 +13,7 @@
- 	var/log_amount = 10
- 
- /obj/structure/flora/tree/attackby(obj/item/W, mob/user, params)
-	if(!cut && log_amount && (!(NODECONSTRUCT in flags)))
-+	if(!cut && log_amount && (!(flags_1 & NODECONSTRUCT_1)))
- 		if(W.sharpness && W.force > 0)
- 			if(W.hitsound)
- 				playsound(get_turf(src), W.hitsound, 100, 0, 0)
@@ -1,10 +0,0 @@
-diff a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm	(rejected hunks)
-@@ -5,7 +5,7 @@
- 	icon_state = "cart"
- 	anchored = FALSE
- 	density = TRUE
-	container_type = OPENCONTAINER
-+	container_type = OPENCONTAINER_1
- 	//copypaste sorry
- 	var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
- 	var/obj/item/storage/bag/trash/mybag	= null
@@ -1,10 +0,0 @@
-diff a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm	(rejected hunks)
-@@ -177,7 +177,7 @@
- 	icon = 'icons/obj/items_and_weapons.dmi'
- 	icon_state = "offhand"
- 	w_class = WEIGHT_CLASS_HUGE
-	flags = ABSTRACT | NODROP | NOBLUDGEON | DROPDEL
-+	flags_1 = ABSTRACT_1 | NODROP_1 | NOBLUDGEON_1 | DROPDEL_1
- 	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
- 	var/obj/machinery/manned_turret/turret
- 
@@ -1,18 +0,0 @@
-diff a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm	(rejected hunks)
-@@ -47,14 +47,14 @@
- 	..()
- 
- /obj/structure/mirror/obj_break(damage_flag)
-	if(!broken && !(flags & NODECONSTRUCT))
-+	if(!broken && !(flags_1 & NODECONSTRUCT_1))
- 		icon_state = "mirror_broke"
- 		playsound(src, "shatter", 70, 1)
- 		desc = "Oh no, seven years of bad luck!"
- 		broken = 1
- 
- /obj/structure/mirror/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
-+	if(!(flags_1 & NODECONSTRUCT_1))
- 		if(!disassembled)
- 			new /obj/item/shard( src.loc )
- 	qdel(src)
@@ -1,11 +0,0 @@
-diff a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm	(rejected hunks)
-@@ -326,6 +326,6 @@
- 	icon_state = "direction_bridge"
- 
- /obj/structure/sign/logo
-	name = "station logo"
-	desc = "A sign: SPACE STATION 13."
-+	name = "nanotrasen logo"
-+	desc = "The Nanotrasen corporate logo."
- 	icon_state = "nanotrasen_sign1"
-\ No newline at end of file
@@ -1,37 +0,0 @@
-diff a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm	(rejected hunks)
-@@ -94,7 +94,7 @@
- 
- 
- /obj/structure/table/attackby(obj/item/I, mob/user, params)
-	if(!(flags & NODECONSTRUCT))
-+	if(!(flags_1 & NODECONSTRUCT_1))
- 		if(istype(I, /obj/item/screwdriver) && deconstruction_ready)
- 			to_chat(user, "<span class='notice'>You start disassembling [src]...</span>")
- 			playsound(src.loc, I.usesound, 50, 1)
-@@ -429,7 +429,7 @@
- 
- 
- /obj/structure/rack/attackby(obj/item/W, mob/user, params)
-	if (istype(W, /obj/item/wrench) && !(flags&NODECONSTRUCT))
-+	if (istype(W, /obj/item/wrench) && !(flags_1&NODECONSTRUCT_1))
- 		playsound(src.loc, W.usesound, 50, 1)
- 		deconstruct(TRUE)
- 		return
-@@ -466,7 +466,7 @@
-  */
- 
- /obj/structure/rack/deconstruct(disassembled = TRUE)
-	if(!(flags&NODECONSTRUCT))
-+	if(!(flags_1&NODECONSTRUCT_1))
- 		density = FALSE
- 		var/obj/item/rack_parts/newparts = new(loc)
- 		transfer_fingerprints_to(newparts)
-@@ -482,7 +482,7 @@
- 	desc = "Parts of a rack."
- 	icon = 'icons/obj/items_and_weapons.dmi'
- 	icon_state = "rack_parts"
-	flags = CONDUCT
-+	flags_1 = CONDUCT_1
- 	materials = list(MAT_METAL=2000)
- 	var/building = FALSE
- 
@@ -1,10 +0,0 @@
-diff a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm	(rejected hunks)
-@@ -462,7 +462,7 @@
- 
- 	if(istype(O, /obj/item/reagent_containers))
- 		var/obj/item/reagent_containers/RG = O
-		if(RG.container_type & OPENCONTAINER)
-+		if(RG.container_type & OPENCONTAINER_1)
- 			if(!RG.reagents.holder_full())
- 				RG.reagents.add_reagent("[dispensedreagent]", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
- 				to_chat(user, "<span class='notice'>You fill [RG] from [src].</span>")
@@ -1,10 +0,0 @@
-diff a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm	(rejected hunks)
-@@ -188,7 +188,7 @@
- 			to_chat(user, "<span class='warning'>[src] is already in good condition!</span>")
- 		return
- 
-	if(!(flags&NODECONSTRUCT))
-+	if(!(flags_1&NODECONSTRUCT_1))
- 		if(istype(I, /obj/item/screwdriver))
- 			playsound(src, I.usesound, 75, 1)
- 			if(reinf)
@@ -1,9 +0,0 @@
-diff a/code/game/sound.dm b/code/game/sound.dm	(rejected hunks)
-@@ -145,7 +145,3 @@
- 			if ("can_open")
- 				soundin = pick('sound/effects/can_open1.ogg', 'sound/effects/can_open2.ogg', 'sound/effects/can_open3.ogg')
- 	return soundin
-
-/proc/playsound_global(file, repeat = 0, wait, channel, volume)
-	for(var/V in GLOB.clients)
-		V << sound(file, repeat, wait, channel, volume)
@@ -1,10 +0,0 @@
-diff a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm	(rejected hunks)
-@@ -66,7 +66,7 @@
- 	icon_state = "grass"
- 	floor_tile = /obj/item/stack/tile/grass
- 	broken_states = list("sand")
-	flags = NONE
-+	flags_1 = NONE
- 	var/ore_type = /obj/item/ore/glass
- 	var/turfverb = "uproot"
- 
@@ -1 +0,0 @@
-garbage
@@ -1 +0,0 @@
-garbage
@@ -1,10 +0,0 @@
-diff a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm	(rejected hunks)
-@@ -8,7 +8,7 @@
- 	w_class = WEIGHT_CLASS_NORMAL
- 	throw_speed = 2
- 	throw_range = 4
-	flags = CONDUCT
-+	flags_1 = CONDUCT_1
- 	var/status = FALSE   //0 - not readied //1 - bomb finished with welder
- 	var/obj/item/device/assembly_holder/bombassembly = null   //The first part of the bomb is an assembly holder, holding an igniter+some device
- 	var/obj/item/tank/bombtank = null //the second part of the bomb is a plasma tank
@@ -1,10 +0,0 @@
-diff a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm	(rejected hunks)
-@@ -734,7 +734,7 @@
- 	update_icon()
- 
- /obj/machinery/airalarm/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
-+	if(!(flags_1 & NODECONSTRUCT_1))
- 		new /obj/item/stack/sheet/metal(loc, 2)
- 		var/obj/item/I = new /obj/item/electronics/airalarm(loc)
- 		if(!disassembled)
@@ -1,18 +0,0 @@
-diff a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm	(rejected hunks)
-@@ -473,14 +473,14 @@
- 	W.registered_name = H.real_name
- 	W.update_label(W.registered_name, W.assignment)
- 
-	// The shielded hardsuit is already NODROP
-+	// The shielded hardsuit is already NODROP_1
- 	no_drops += H.get_item_by_slot(slot_gloves)
- 	no_drops += H.get_item_by_slot(slot_shoes)
- 	no_drops += H.get_item_by_slot(slot_w_uniform)
- 	no_drops += H.get_item_by_slot(slot_ears)
- 	for(var/i in no_drops)
- 		var/obj/item/I = i
-		I.flags |= NODROP
-+		I.flags_1 |= NODROP_1
- 
- /datum/outfit/ctf/instagib
- 	r_hand = /obj/item/gun/energy/laser/instakill
@@ -1,10 +0,0 @@
-diff a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm	(rejected hunks)
-@@ -145,7 +145,7 @@
- 
- 			var/reason = ""
- 			if(requestonly)
-				reason = stripped_input("Reason:", name, "") as text|null
-+				reason = stripped_input("Reason:", name, "")
- 				if(isnull(reason) || ..())
- 					return
- 
@@ -1,10 +0,0 @@
-diff a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm	(rejected hunks)
-@@ -73,7 +73,7 @@
- 			return
- 
- 	//Logs all hrefs, except chat pings
-	if(href_list["proc"] != "ping")
-+	if(!(href_list["_src_"] == "chat" && href_list["proc"] == "ping" && LAZYLEN(href_list) == 2))
- 		WRITE_FILE(GLOB.world_href_log, "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>")
- 
- 	// Admin PM
@@ -1,10 +0,0 @@
-diff a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm	(rejected hunks)
-@@ -193,7 +193,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
- 		return 0
- 	S.cd = "/"
- 
-	WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX		//updates (or failing that the sanity checks) will ensure data is not invalid at load. Assume up-to-date)
-+	WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX)		//updates (or failing that the sanity checks) will ensure data is not invalid at load. Assume up-to-date
- 
- 	//general preferences
- 	WRITE_FILE(S["ooccolor"], ooccolor)
@@ -1,10 +0,0 @@
-diff a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm	(rejected hunks)
-@@ -384,7 +384,7 @@
- 	item_color = "black"
- 	desc = "A pair of black shoes."
- 	permeability_coefficient = 0.05
-	flags = NOSLIP
-+	flags_1 = NOSLIP_1
- 	origin_tech = "syndicate=2"
- 	resistance_flags = 0
- 	pockets = /obj/item/storage/internal/pocket/shoes
@@ -1,10 +0,0 @@
-diff a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm	(rejected hunks)
-@@ -494,7 +494,7 @@ BLIND     // can't see anything
- 	w_class = WEIGHT_CLASS_BULKY
- 	gas_transfer_coefficient = 0.01
- 	permeability_coefficient = 0.02
-	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
-+	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
- 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- 	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals)
- 	slowdown = 1
@@ -1,10 +0,0 @@
-diff a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm	(rejected hunks)
-@@ -331,7 +331,7 @@
- 	vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS
- 	darkness_view = 8
- 	scan_reagents = 1
-	flags = NODROP
-+	flags_1 = NODROP_1
- 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- 
- /obj/item/clothing/glasses/godeye/attackby(obj/item/W as obj, mob/user as mob, params)
@@ -1,9 +0,0 @@
-diff a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm	(rejected hunks)
-@@ -4,7 +4,6 @@
- /obj/item/clothing/head/collectable
- 	name = "collectable hat"
- 	desc = "A rare collectable hat."
-	dynamic_hair_suffix = "+detective"
- 
- 
- /obj/item/clothing/head/collectable/petehat
@@ -1,16 +0,0 @@
-diff a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm	(rejected hunks)
-@@ -250,7 +250,7 @@
- 	name = "jester hat"
- 	desc = "A hat with bells, to add some merriness to the suit."
- 	icon_state = "jester_hat"
-	dynamic_hair_suffix = "null"
-+	dynamic_hair_suffix = ""
- 
- /obj/item/clothing/head/rice_hat
- 	name = "rice hat"
-@@ -302,4 +302,4 @@
- 	name = "jester hat"
- 	desc = "A hat with bells, to add some merriness to the suit."
- 	icon_state = "jester_hat2"
-	dynamic_hair_suffix = "null"
-+	dynamic_hair_suffix = ""
@@ -1,10 +0,0 @@
-diff a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm	(rejected hunks)
-@@ -348,7 +348,7 @@
- 	w_class = WEIGHT_CLASS_BULKY
- 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- 	allowed = list(/obj/item/gun/energy, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals/emergency_oxygen)
-	flags = THICKMATERIAL
-+	flags_1 = THICKMATERIAL_1
- 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
- 	cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
- 	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
@@ -1,10 +0,0 @@
-diff a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm	(rejected hunks)
-@@ -18,7 +18,7 @@
- 	w_class = WEIGHT_CLASS_BULKY
- 	gas_transfer_coefficient = 0.01
- 	permeability_coefficient = 0.01
-	flags = THICKMATERIAL
-+	flags_1 = THICKMATERIAL_1
- 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- 	slowdown = 1
- 	allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/pen, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray)
@@ -1,19 +0,0 @@
-diff a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm	(rejected hunks)
-@@ -21,7 +21,7 @@
- 	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/extinguisher, /obj/item/crowbar)
- 	slowdown = 1
- 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-	flags = STOPSPRESSUREDMAGE | THICKMATERIAL
-+	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
- 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- 	max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
- 	cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-@@ -124,7 +124,7 @@
- 	w_class = WEIGHT_CLASS_BULKY
- 	gas_transfer_coefficient = 0.90
- 	permeability_coefficient = 0.50
-	flags = THICKMATERIAL
-+	flags_1 = THICKMATERIAL_1
- 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
- 	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/device/geiger_counter)
- 	slowdown = 1.5
@@ -1,10 +0,0 @@
-diff a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm	(rejected hunks)
-@@ -96,7 +96,7 @@
- 		else
- 			if(istype(I, /obj/item/reagent_containers))
- 				var/obj/item/reagent_containers/RC = I
-				if(RC.container_type & OPENCONTAINER)
-+				if(RC.container_type & OPENCONTAINER_1)
- 					for(var/datum/reagent/A in RC.reagents.reagent_list)
- 						.[A.type] += A.volume
- 			.[I.type] += 1
@@ -1,10 +0,0 @@
-diff a/code/modules/fields/turf_objects.dm b/code/modules/fields/turf_objects.dm	(rejected hunks)
-@@ -6,7 +6,7 @@
- 	icon_state = null
- 	alpha = 0
- 	invisibility = INVISIBILITY_ABSTRACT
-	flags = ABSTRACT|ON_BORDER
-+	flags_1 = ABSTRACT_1|ON_BORDER_1
- 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- 	var/datum/proximity_monitor/advanced/parent = null
- 
@@ -1,10 +0,0 @@
-diff a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm	(rejected hunks)
-@@ -357,7 +357,7 @@
- /obj/item/reagent_containers/food/drinks/soda_cans/attack_self(mob/user)
- 	if(!is_open_container())
- 		to_chat(user, "You pull back the tab of \the [src] with a satisfying pop.") //Ahhhhhhhh
-		container_type = OPENCONTAINER
-+		container_type = OPENCONTAINER_1
- 		playsound(src, "can_open", 50, 1)
- 		spillable = TRUE
- 		return
@@ -1,10 +0,0 @@
-diff a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm	(rejected hunks)
-@@ -4,7 +4,7 @@
- /obj/item/reagent_containers/food
- 	possible_transfer_amounts = list()
- 	volume = 50	//Sets the default container amount for all food items.
-	container_type = INJECTABLE
-+	container_type = INJECTABLE_1
- 	resistance_flags = FLAMMABLE
- 	var/foodtype = NONE
- 	var/last_check_time
@@ -225,6 +225,11 @@
 	tastes = list("meat" = 1, "wheat" = 1)
 	foodtype = GRAIN

+/obj/item/reagent_containers/food/snacks/meat/slab/gorilla
+	name = "gorilla meat"
+	desc = "Much meatier than monkey meat."
+	list_reagents = list("nutriment" = 5, "vitamin" = 1)	
+
 /obj/item/reagent_containers/food/snacks/meat/rawbacon
 	name = "raw piece of bacon"
 	desc = "A raw piece of bacon."
@@ -1,10 +0,0 @@
-diff a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm	(rejected hunks)
-@@ -15,7 +15,7 @@ insert ascii eagle on american flag background here
- 	anchored = TRUE
- 	use_power = IDLE_POWER_USE
- 	idle_power_usage = 5
-	container_type = OPENCONTAINER
-+	container_type = OPENCONTAINER_1
- 	var/obj/item/frying = null	//What's being fried RIGHT NOW?
- 	var/cook_time = 0
- 	var/static/list/deepfry_blacklisted_items = typecacheof(list(
@@ -1,10 +0,0 @@
-diff a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm	(rejected hunks)
-@@ -15,7 +15,7 @@
- 	var/portion = 10
- 	var/selected_drink
- 	var/list/stored_food = list()
-	container_type = OPENCONTAINER
-+	container_type = OPENCONTAINER_1
- 	var/obj/item/reagent_containers/mixer
- 
- /obj/machinery/food_cart/Initialize()
@@ -1,10 +0,0 @@
-diff a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm	(rejected hunks)
-@@ -14,7 +14,7 @@
- 	anchored = FALSE
- 	use_power = NO_POWER_USE
- 	layer = BELOW_OBJ_LAYER
-	container_type = OPENCONTAINER
-+	container_type = OPENCONTAINER_1
- 	max_integrity = 300
- 	var/list/product_types = list()
- 	var/dispense_flavour = ICECREAM_VANILLA
@@ -1,137 +0,0 @@
-diff a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm	(rejected hunks)
-@@ -166,135 +166,6 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
- 
- //Global chat procs
- 
-//Converts an icon to base64. Operates by putting the icon in the iconCache savefile,
-// exporting it as text, and then parsing the base64 from that.
-// (This relies on byond automatically storing icons in savefiles as base64)
-/proc/icon2base64(icon/icon, iconKey = "misc")
-	if (!isicon(icon))
-		return FALSE
-	WRITE_FILE(GLOB.iconCache[iconKey], icon)
-	var/iconData = GLOB.iconCache.ExportText(iconKey)
-	var/list/partial = splittext(iconData, "{")
-	return replacetext(copytext(partial[2], 3, -5), "\n", "")
-
-/proc/icon2html(thing, target, icon_state, dir, frame = 1, moving)
-	if (!thing)
-		return
-	var/static/datum/callback/CB = CALLBACK(GLOBAL_PROC, .proc/send_asset)
-
-	var/key
-	var/icon/I = thing
-	if (!target)
-		return
-	if (target == world)
-		target = GLOB.clients
-
-	var/list/targets
-	if (!islist(target))
-		targets = list(target)
-	else
-		targets = target
-		if (!targets.len)
-			return
-	debug_usr("start")
-	if (!isicon(I))
-		debug_usr("not icon")
-		if (isfile(thing)) //special snowflake
-			debug_usr("file")
-			var/name = sanitize_filename("bicon.[thing]")
-			debug_usr("file:[name]")
-			register_asset(name, thing)
-			var/list/callbacks
-			var/list/callback_args = list()
-			for (var/thing2 in targets)
-				callbacks += CB
-				callback_args[++callback_args.len] = list(thing2, name, TRUE)
-			callback_select(callbacks, callback_args, savereturns = FALSE)
-			return "<img class='icon misc' src=\"[url_encode(name)]\">"
-		debug_usr("not file")
-		var/atom/A
-		if (isnull(dir))
-			dir = A.dir
-		if (isnull(icon_state))
-			icon_state = A.icon_state
-		I = A.icon
-		if (ishuman(thing)) // Shitty workaround for a BYOND issue.
-			debug_usr("human")
-			var/icon/temp = I
-			I = icon()
-			I.Insert(temp, dir = SOUTH)
-			dir = SOUTH
-	else
-		debug_usr("icon")
-		if (isnull(dir))
-			dir = SOUTH
-		if (isnull(icon_state))
-			icon_state = ""
-
-	I = icon(I, icon_state, dir, frame)
-
-	key = sanitize_filename("bicon.[md5(icon2base64(I))].[icon_state].[dir].png")
-	debug_usr("key:[key]")
-	register_asset(key, I)
-	var/list/callbacks = list()
-	var/list/callback_args = list()
-	for (var/thing2 in targets)
-		callbacks += CB
-		callback_args[++callback_args.len] = list(thing2, key, TRUE)
-
-	callback_select(callbacks, callback_args, savereturns = FALSE)
-	return "<img class='icon [icon_state]' src=\"[url_encode(key)]\">"
-
-/proc/icon2base64html(thing)
-	if (!thing)
-		return
-	var/static/list/bicon_cache = list()
-	if (isicon(thing))
-		var/icon/I = thing
-		var/icon_base64 = icon2base64(I)
-
-		if (I.Height() > world.icon_size || I.Width() > world.icon_size)
-			var/icon_md5 = md5(icon_base64)
-			debug_admins(icon_md5)
-			icon_base64 = bicon_cache[icon_md5]
-			if (!icon_base64) // Doesn't exist yet, make it.
-				I = icon(I)
-				I.Scale(world.icon_size, world.icon_size)
-				bicon_cache[icon_md5] = icon_base64 = icon2base64(I)
-
-
-		return "<img class='icon misc' src='data:image/png;base64,[icon_base64]'>"
-
-	// Either an atom or somebody fucked up and is gonna get a runtime, which I'm fine with.
-	var/atom/A = thing
-	var/key = "[istype(A.icon, /icon) ? "\ref[A.icon]" : A.icon]:[A.icon_state]"
-
-
-	if (!bicon_cache[key]) // Doesn't exist, make it.
-		var/icon/I = icon(A.icon, A.icon_state, SOUTH, 1)
-		if (ishuman(thing)) // Shitty workaround for a BYOND issue.
-			var/icon/temp = I
-			I = icon()
-			I.Insert(temp, dir = SOUTH)
-
-		if (I.Height() > world.icon_size || I.Width() > world.icon_size)
-			I.Scale(world.icon_size, world.icon_size)
-
-		bicon_cache[key] = icon2base64(I, key)
-
-	return "<img class='icon [A.icon_state]' src='data:image/png;base64,[bicon_cache[key]]'>"
-
-//Costlier version of icon2html() that uses getFlatIcon() to account for overlays, underlays, etc. Use with extreme moderation, ESPECIALLY on mobs.
-/proc/costly_icon2html(thing, target)
-	if (!thing)
-		return
-
-	if (isicon(thing))
-		return icon2html(thing, target)
-
-	var/icon/I = getFlatIcon(thing)
-	return icon2html(I, target)
-
- /proc/to_chat(target, message)
- 	if(!target)
- 		return
@@ -1,19 +0,0 @@
-diff a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm	(rejected hunks)
-@@ -62,7 +62,7 @@
- /obj/item/pickaxe/drill/cyborg
- 	name = "cyborg mining drill"
- 	desc = "An integrated electric mining drill."
-	flags = NODROP
-+	flags_1 = NODROP_1
- 
- /obj/item/pickaxe/drill/diamonddrill
- 	name = "diamond-tipped mining drill"
-@@ -72,7 +72,7 @@
- 	desc = "Yours is the drill that will pierce the heavens!"
- 
- /obj/item/pickaxe/drill/cyborg/diamond //This is the BORG version!
-	name = "diamond-tipped cyborg mining drill" //To inherit the NODROP flag, and easier to change borg specific drill mechanics.
-+	name = "diamond-tipped cyborg mining drill" //To inherit the NODROP_1 flag, and easier to change borg specific drill mechanics.
- 	icon_state = "diamonddrill"
- 	digspeed = 7
- 
@@ -1,35 +0,0 @@
-diff a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm	(rejected hunks)
-@@ -167,7 +167,7 @@
- 	pixel_y = -32
- 
- /obj/item/device/gps/computer/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/wrench) && !(flags&NODECONSTRUCT))
-+	if(istype(W, /obj/item/wrench) && !(flags_1&NODECONSTRUCT_1))
- 		playsound(src.loc, W.usesound, 50, 1)
- 		user.visible_message("<span class='warning'>[user] disassembles the gps.</span>", \
- 						"<span class='notice'>You start to disassemble the gps...</span>", "You hear clanking and banging noises.")
-@@ -198,7 +198,7 @@
- 	light_color = "#DDFFD3"
- 	max_n_of_items = 10
- 	pixel_y = -4
-	flags = NODECONSTRUCT
-+	flags_1 = NODECONSTRUCT_1
- 	var/empty = FALSE
- 
- /obj/machinery/smartfridge/survival_pod/Initialize(mapload)
-@@ -237,13 +237,13 @@
- 	CanAtmosPass = ATMOS_PASS_NO
- 
- /obj/structure/fans/deconstruct()
-	if(!(flags & NODECONSTRUCT))
-+	if(!(flags_1 & NODECONSTRUCT_1))
- 		if(buildstacktype)
- 			new buildstacktype(loc,buildstackamount)
- 	qdel(src)
- 
- /obj/structure/fans/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/wrench) && !(flags&NODECONSTRUCT))
-+	if(istype(W, /obj/item/wrench) && !(flags_1&NODECONSTRUCT_1))
- 		playsound(src.loc, W.usesound, 50, 1)
- 		user.visible_message("<span class='warning'>[user] disassembles the fan.</span>", \
- 						"<span class='notice'>You start to disassemble the fan...</span>", "You hear clanking and banging noises.")
@@ -592,6 +592,7 @@
 	extra = 1
 	extra2 = 1
 	icon = 'icons/mob/mam_body_markings.dmi'
+	gender_specific = 1

 	/datum/sprite_accessory/mam_body_markings/xeno
 	name = "Xeno"
@@ -1,10 +0,0 @@
-diff a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm	(rejected hunks)
-@@ -167,7 +167,7 @@
- 	if(iscarbon(src))
- 		var/mob/living/carbon/C = src
- 		for(var/obj/item/bloodcrawl/BC in C)
-			BC.flags = null
-+			BC.flags_1 = null
- 			qdel(BC)
- 	qdel(src.holder)
- 	src.holder = null
@@ -1,19 +0,0 @@
-diff a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm	(rejected hunks)
-@@ -213,7 +213,7 @@
- 		if(href_list["internal"])
- 			var/slot = text2num(href_list["internal"])
- 			var/obj/item/ITEM = get_item_by_slot(slot)
-			if(ITEM && istype(ITEM, /obj/item/tank) && wear_mask && (wear_mask.flags & MASKINTERNALS))
-+			if(ITEM && istype(ITEM, /obj/item/tank) && wear_mask && (wear_mask.flags_1 & MASKINTERNALS_1))
- 				visible_message("<span class='danger'>[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].</span>", \
- 								"<span class='userdanger'>[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM.name].</span>")
- 				if(do_mob(usr, src, POCKET_STRIP_DELAY))
-@@ -221,7 +221,7 @@
- 						internal = null
- 						update_internals_hud_icon(0)
- 					else if(ITEM && istype(ITEM, /obj/item/tank))
-						if((wear_mask && (wear_mask.flags & MASKINTERNALS)) || getorganslot("breathing_tube"))
-+						if((wear_mask && (wear_mask.flags_1 & MASKINTERNALS_1)) || getorganslot("breathing_tube"))
- 							internal = ITEM
- 							update_internals_hud_icon(1)
- 
@@ -1,91 +0,0 @@
-diff a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm	(rejected hunks)
-@@ -141,42 +141,42 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
- 	dat += "<table>"
- 	for(var/i in 1 to held_items.len)
- 		var/obj/item/I = get_item_for_held_index(i)
-		dat += "<tr><td><B>[get_held_index_name(i)]:</B></td><td><A href='?src=\ref[src];item=[slot_hands];hand_index=[i]'>[(I && !(I.flags & ABSTRACT)) ? I : "<font color=grey>Empty</font>"]</a></td></tr>"
-+		dat += "<tr><td><B>[get_held_index_name(i)]:</B></td><td><A href='?src=\ref[src];item=[slot_hands];hand_index=[i]'>[(I && !(I.flags_1 & ABSTRACT_1)) ? I : "<font color=grey>Empty</font>"]</a></td></tr>"
- 	dat += "<tr><td>&nbsp;</td></tr>"
- 
-	dat += "<tr><td><B>Back:</B></td><td><A href='?src=\ref[src];item=[slot_back]'>[(back && !(back.flags&ABSTRACT)) ? back : "<font color=grey>Empty</font>"]</A>"
-+	dat += "<tr><td><B>Back:</B></td><td><A href='?src=\ref[src];item=[slot_back]'>[(back && !(back.flags_1&ABSTRACT_1)) ? back : "<font color=grey>Empty</font>"]</A>"
- 	if(has_breathable_mask && istype(back, /obj/item/tank))
- 		dat += "&nbsp;<A href='?src=\ref[src];internal=[slot_back]'>[internal ? "Disable Internals" : "Set Internals"]</A>"
- 
- 	dat += "</td></tr><tr><td>&nbsp;</td></tr>"
- 
-	dat += "<tr><td><B>Head:</B></td><td><A href='?src=\ref[src];item=[slot_head]'>[(head && !(head.flags&ABSTRACT)) ? head : "<font color=grey>Empty</font>"]</A></td></tr>"
-+	dat += "<tr><td><B>Head:</B></td><td><A href='?src=\ref[src];item=[slot_head]'>[(head && !(head.flags_1&ABSTRACT_1)) ? head : "<font color=grey>Empty</font>"]</A></td></tr>"
- 
- 	if(slot_wear_mask in obscured)
- 		dat += "<tr><td><font color=grey><B>Mask:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
- 	else
-		dat += "<tr><td><B>Mask:</B></td><td><A href='?src=\ref[src];item=[slot_wear_mask]'>[(wear_mask && !(wear_mask.flags&ABSTRACT)) ? wear_mask : "<font color=grey>Empty</font>"]</A></td></tr>"
-+		dat += "<tr><td><B>Mask:</B></td><td><A href='?src=\ref[src];item=[slot_wear_mask]'>[(wear_mask && !(wear_mask.flags_1&ABSTRACT_1)) ? wear_mask : "<font color=grey>Empty</font>"]</A></td></tr>"
- 
- 	if(slot_neck in obscured)
- 		dat += "<tr><td><font color=grey><B>Neck:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
- 	else
-		dat += "<tr><td><B>Neck:</B></td><td><A href='?src=\ref[src];item=[slot_neck]'>[(wear_neck && !(wear_neck.flags&ABSTRACT)) ? wear_neck : "<font color=grey>Empty</font>"]</A></td></tr>"
-+		dat += "<tr><td><B>Neck:</B></td><td><A href='?src=\ref[src];item=[slot_neck]'>[(wear_neck && !(wear_neck.flags_1&ABSTRACT_1)) ? wear_neck : "<font color=grey>Empty</font>"]</A></td></tr>"
- 
- 	if(slot_glasses in obscured)
- 		dat += "<tr><td><font color=grey><B>Eyes:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
- 	else
-		dat += "<tr><td><B>Eyes:</B></td><td><A href='?src=\ref[src];item=[slot_glasses]'>[(glasses && !(glasses.flags&ABSTRACT))	? glasses : "<font color=grey>Empty</font>"]</A></td></tr>"
-+		dat += "<tr><td><B>Eyes:</B></td><td><A href='?src=\ref[src];item=[slot_glasses]'>[(glasses && !(glasses.flags_1&ABSTRACT_1))	? glasses : "<font color=grey>Empty</font>"]</A></td></tr>"
- 
- 	if(slot_ears in obscured)
- 		dat += "<tr><td><font color=grey><B>Ears:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
- 	else
-		dat += "<tr><td><B>Ears:</B></td><td><A href='?src=\ref[src];item=[slot_ears]'>[(ears && !(ears.flags&ABSTRACT))		? ears		: "<font color=grey>Empty</font>"]</A></td></tr>"
-+		dat += "<tr><td><B>Ears:</B></td><td><A href='?src=\ref[src];item=[slot_ears]'>[(ears && !(ears.flags_1&ABSTRACT_1))		? ears		: "<font color=grey>Empty</font>"]</A></td></tr>"
- 
- 	dat += "<tr><td>&nbsp;</td></tr>"
- 
-	dat += "<tr><td><B>Exosuit:</B></td><td><A href='?src=\ref[src];item=[slot_wear_suit]'>[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? wear_suit : "<font color=grey>Empty</font>"]</A></td></tr>"
-+	dat += "<tr><td><B>Exosuit:</B></td><td><A href='?src=\ref[src];item=[slot_wear_suit]'>[(wear_suit && !(wear_suit.flags_1&ABSTRACT_1)) ? wear_suit : "<font color=grey>Empty</font>"]</A></td></tr>"
- 	if(wear_suit)
-		dat += "<tr><td>&nbsp;&#8627;<B>Suit Storage:</B></td><td><A href='?src=\ref[src];item=[slot_s_store]'>[(s_store && !(s_store.flags&ABSTRACT)) ? s_store : "<font color=grey>Empty</font>"]</A>"
-+		dat += "<tr><td>&nbsp;&#8627;<B>Suit Storage:</B></td><td><A href='?src=\ref[src];item=[slot_s_store]'>[(s_store && !(s_store.flags_1&ABSTRACT_1)) ? s_store : "<font color=grey>Empty</font>"]</A>"
- 		if(has_breathable_mask && istype(s_store, /obj/item/tank))
- 			dat += "&nbsp;<A href='?src=\ref[src];internal=[slot_s_store]'>[internal ? "Disable Internals" : "Set Internals"]</A>"
- 		dat += "</td></tr>"
-@@ -186,30 +186,30 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
- 	if(slot_shoes in obscured)
- 		dat += "<tr><td><font color=grey><B>Shoes:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
- 	else
-		dat += "<tr><td><B>Shoes:</B></td><td><A href='?src=\ref[src];item=[slot_shoes]'>[(shoes && !(shoes.flags&ABSTRACT))		? shoes		: "<font color=grey>Empty</font>"]</A></td></tr>"
-+		dat += "<tr><td><B>Shoes:</B></td><td><A href='?src=\ref[src];item=[slot_shoes]'>[(shoes && !(shoes.flags_1&ABSTRACT_1))		? shoes		: "<font color=grey>Empty</font>"]</A></td></tr>"
- 
- 	if(slot_gloves in obscured)
- 		dat += "<tr><td><font color=grey><B>Gloves:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
- 	else
-		dat += "<tr><td><B>Gloves:</B></td><td><A href='?src=\ref[src];item=[slot_gloves]'>[(gloves && !(gloves.flags&ABSTRACT))		? gloves	: "<font color=grey>Empty</font>"]</A></td></tr>"
-+		dat += "<tr><td><B>Gloves:</B></td><td><A href='?src=\ref[src];item=[slot_gloves]'>[(gloves && !(gloves.flags_1&ABSTRACT_1))		? gloves	: "<font color=grey>Empty</font>"]</A></td></tr>"
- 
- 	if(slot_w_uniform in obscured)
- 		dat += "<tr><td><font color=grey><B>Uniform:</B></font></td><td><font color=grey>Obscured</font></td></tr>"
- 	else
-		dat += "<tr><td><B>Uniform:</B></td><td><A href='?src=\ref[src];item=[slot_w_uniform]'>[(w_uniform && !(w_uniform.flags&ABSTRACT)) ? w_uniform : "<font color=grey>Empty</font>"]</A></td></tr>"
-+		dat += "<tr><td><B>Uniform:</B></td><td><A href='?src=\ref[src];item=[slot_w_uniform]'>[(w_uniform && !(w_uniform.flags_1&ABSTRACT_1)) ? w_uniform : "<font color=grey>Empty</font>"]</A></td></tr>"
- 
- 	if((w_uniform == null && !(dna && dna.species.nojumpsuit)) || (slot_w_uniform in obscured))
- 		dat += "<tr><td><font color=grey>&nbsp;&#8627;<B>Pockets:</B></font></td></tr>"
- 		dat += "<tr><td><font color=grey>&nbsp;&#8627;<B>ID:</B></font></td></tr>"
- 		dat += "<tr><td><font color=grey>&nbsp;&#8627;<B>Belt:</B></font></td></tr>"
- 	else
-		dat += "<tr><td>&nbsp;&#8627;<B>Belt:</B></td><td><A href='?src=\ref[src];item=[slot_belt]'>[(belt && !(belt.flags&ABSTRACT)) ? belt : "<font color=grey>Empty</font>"]</A>"
-+		dat += "<tr><td>&nbsp;&#8627;<B>Belt:</B></td><td><A href='?src=\ref[src];item=[slot_belt]'>[(belt && !(belt.flags_1&ABSTRACT_1)) ? belt : "<font color=grey>Empty</font>"]</A>"
- 		if(has_breathable_mask && istype(belt, /obj/item/tank))
- 			dat += "&nbsp;<A href='?src=\ref[src];internal=[slot_belt]'>[internal ? "Disable Internals" : "Set Internals"]</A>"
- 		dat += "</td></tr>"
-		dat += "<tr><td>&nbsp;&#8627;<B>Pockets:</B></td><td><A href='?src=\ref[src];pockets=left'>[(l_store && !(l_store.flags&ABSTRACT)) ? "Left (Full)" : "<font color=grey>Left (Empty)</font>"]</A>"
-		dat += "&nbsp;<A href='?src=\ref[src];pockets=right'>[(r_store && !(r_store.flags&ABSTRACT)) ? "Right (Full)" : "<font color=grey>Right (Empty)</font>"]</A></td></tr>"
-		dat += "<tr><td>&nbsp;&#8627;<B>ID:</B></td><td><A href='?src=\ref[src];item=[slot_wear_id]'>[(wear_id && !(wear_id.flags&ABSTRACT)) ? wear_id : "<font color=grey>Empty</font>"]</A></td></tr>"
-+		dat += "<tr><td>&nbsp;&#8627;<B>Pockets:</B></td><td><A href='?src=\ref[src];pockets=left'>[(l_store && !(l_store.flags_1&ABSTRACT_1)) ? "Left (Full)" : "<font color=grey>Left (Empty)</font>"]</A>"
-+		dat += "&nbsp;<A href='?src=\ref[src];pockets=right'>[(r_store && !(r_store.flags_1&ABSTRACT_1)) ? "Right (Full)" : "<font color=grey>Right (Empty)</font>"]</A></td></tr>"
-+		dat += "<tr><td>&nbsp;&#8627;<B>ID:</B></td><td><A href='?src=\ref[src];item=[slot_wear_id]'>[(wear_id && !(wear_id.flags_1&ABSTRACT_1)) ? wear_id : "<font color=grey>Empty</font>"]</A></td></tr>"
- 
- 	if(handcuffed)
- 		dat += "<tr><td><B>Handcuffed:</B> <A href='?src=\ref[src];item=[slot_handcuffed]'>Remove</A></td></tr>"
@@ -1,19 +0,0 @@
-diff a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm	(rejected hunks)
-@@ -153,7 +153,7 @@
- 	if(!locate(/obj/item) in held_items)
- 		best_force = 0
- 
-	if(restrained() || blacklistItems[pickupTarget] || (pickupTarget && (pickupTarget.flags & NODROP)))
-+	if(restrained() || blacklistItems[pickupTarget] || (pickupTarget && (pickupTarget.flags_1 & NODROP_1)))
- 		pickupTarget = null
- 
- 	if(!resisting && pickupTarget)
-@@ -274,7 +274,7 @@
- 					// check if target has a weapon
- 					var/obj/item/W
- 					for(var/obj/item/I in target.held_items)
-						if(!(I.flags & ABSTRACT))
-+						if(!(I.flags_1 & ABSTRACT_1))
- 							W = I
- 							break
- 
@@ -1,170 +1,173 @@
-
-
-/mob/living/carbon/monkey
-
-
-/mob/living/carbon/monkey/Life()
-	set invisibility = 0
-	set background = BACKGROUND_ENABLED
-
-	if (notransform)
-		return
-
-	if(..())
-
-		if(!client)
-			if(stat == CONSCIOUS)
-				if(!handle_combat())
-					if(prob(33) && canmove && isturf(loc) && !pulledby)
+
+
+/mob/living/carbon/monkey
+
+
+/mob/living/carbon/monkey/Life()
+	set invisibility = 0
+	set background = BACKGROUND_ENABLED
+
+	if (notransform)
+		return
+
+	if(..())
+
+		if(!client)
+			if(stat == CONSCIOUS)
+				if(!handle_combat())
+					if(prob(33) && canmove && isturf(loc) && !pulledby)
 						step(src, pick(GLOB.cardinals))
-					if(prob(1))
-						emote(pick("scratch","jump","roll","tail"))
-			else
-				walk_to(src,0)
-
-/mob/living/carbon/monkey/handle_mutations_and_radiation()
-
-	if (radiation)
-		if (radiation > 100)
-			if(!IsKnockdown())
-				emote("collapse")
-			Knockdown(200)
-			to_chat(src, "<span class='danger'>You feel weak.</span>")
-
-		switch(radiation)
-
-			if(50 to 75)
-				if(prob(5))
-					if(!IsKnockdown())
-						emote("collapse")
-					Knockdown(60)
-					to_chat(src, "<span class='danger'>You feel weak.</span>")
-
-			if(75 to 100)
-				if(prob(1))
-					to_chat(src, "<span class='danger'>You mutate!</span>")
-					randmutb()
-					emote("gasp")
-					domutcheck()
-		..()
-
-/mob/living/carbon/monkey/handle_breath_temperature(datum/gas_mixture/breath)
-	if(abs(310.15 - breath.temperature) > 50)
-		switch(breath.temperature)
-			if(-INFINITY to 120)
-				adjustFireLoss(3)
-			if(120 to 200)
-				adjustFireLoss(1.5)
-			if(200 to 260)
-				adjustFireLoss(0.5)
-			if(360 to 400)
-				adjustFireLoss(2)
-			if(400 to 1000)
-				adjustFireLoss(3)
-			if(1000 to INFINITY)
-				adjustFireLoss(8)
-
-/mob/living/carbon/monkey/handle_environment(datum/gas_mixture/environment)
-	if(!environment)
-		return
-
-	var/loc_temp = get_temperature(environment)
-
-	if(stat != DEAD)
-		natural_bodytemperature_stabilization()
-
-	if(!on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases
-		if(loc_temp < bodytemperature)
-			bodytemperature += min(((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR), BODYTEMP_COOLING_MAX)
-		else
-			bodytemperature += min(((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX)
-
-	if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT)
-		switch(bodytemperature)
-			if(360 to 400)
-				throw_alert("temp", /obj/screen/alert/hot, 1)
-				apply_damage(HEAT_DAMAGE_LEVEL_1, BURN)
-			if(400 to 460)
-				throw_alert("temp", /obj/screen/alert/hot, 2)
-				apply_damage(HEAT_DAMAGE_LEVEL_2, BURN)
-			if(460 to INFINITY)
-				throw_alert("temp", /obj/screen/alert/hot, 3)
-				if(on_fire)
-					apply_damage(HEAT_DAMAGE_LEVEL_3, BURN)
-				else
-					apply_damage(HEAT_DAMAGE_LEVEL_2, BURN)
-
-	else if(bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
-		if(!istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
-			switch(bodytemperature)
-				if(200 to 260)
-					throw_alert("temp", /obj/screen/alert/cold, 1)
-					apply_damage(COLD_DAMAGE_LEVEL_1, BURN)
-				if(120 to 200)
-					throw_alert("temp", /obj/screen/alert/cold, 2)
-					apply_damage(COLD_DAMAGE_LEVEL_2, BURN)
-				if(-INFINITY to 120)
-					throw_alert("temp", /obj/screen/alert/cold, 3)
-					apply_damage(COLD_DAMAGE_LEVEL_3, BURN)
-		else
-			clear_alert("temp")
-
-	else
-		clear_alert("temp")
-
-	//Account for massive pressure differences
-
-	var/pressure = environment.return_pressure()
-	var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob.
-	switch(adjusted_pressure)
-		if(HAZARD_HIGH_PRESSURE to INFINITY)
-			adjustBruteLoss( min( ( (adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) )
-			throw_alert("pressure", /obj/screen/alert/highpressure, 2)
-		if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE)
-			throw_alert("pressure", /obj/screen/alert/highpressure, 1)
-		if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE)
-			clear_alert("pressure")
-		if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
-			throw_alert("pressure", /obj/screen/alert/lowpressure, 1)
-		else
-			adjustBruteLoss( LOW_PRESSURE_DAMAGE )
-			throw_alert("pressure", /obj/screen/alert/lowpressure, 2)
-
-	return
-
-/mob/living/carbon/monkey/handle_random_events()
-	if (prob(1) && prob(2))
-		emote("scratch")
-
-/mob/living/carbon/monkey/has_smoke_protection()
-	if(wear_mask)
+					if(prob(1))
+						emote(pick("scratch","jump","roll","tail"))
+			else
+				walk_to(src,0)
+
+/mob/living/carbon/monkey/handle_mutations_and_radiation()
+
+	if (radiation)
+		if (radiation > 100)
+			if(!IsKnockdown())
+				emote("collapse")
+			Knockdown(200)
+			to_chat(src, "<span class='danger'>You feel weak.</span>")
+		if(radiation > 30 && prob((radiation - 30) * (radiation - 30) * 0.00002))
+			gorillize()
+			return
+		switch(radiation)
+
+			if(50 to 75)
+				if(prob(5))
+					if(!IsKnockdown())
+						emote("collapse")
+					Knockdown(60)
+					to_chat(src, "<span class='danger'>You feel weak.</span>")
+
+			if(75 to 100)
+				if(prob(1))
+					to_chat(src, "<span class='danger'>You mutate!</span>")
+					randmutb()
+					emote("gasp")
+					domutcheck()
+		..()
+
+/mob/living/carbon/monkey/handle_breath_temperature(datum/gas_mixture/breath)
+	if(abs(310.15 - breath.temperature) > 50)
+		switch(breath.temperature)
+			if(-INFINITY to 120)
+				adjustFireLoss(3)
+			if(120 to 200)
+				adjustFireLoss(1.5)
+			if(200 to 260)
+				adjustFireLoss(0.5)
+			if(360 to 400)
+				adjustFireLoss(2)
+			if(400 to 1000)
+				adjustFireLoss(3)
+			if(1000 to INFINITY)
+				adjustFireLoss(8)
+
+/mob/living/carbon/monkey/handle_environment(datum/gas_mixture/environment)
+	if(!environment)
+		return
+
+	var/loc_temp = get_temperature(environment)
+
+	if(stat != DEAD)
+		natural_bodytemperature_stabilization()
+
+	if(!on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases
+		if(loc_temp < bodytemperature)
+			bodytemperature += min(((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR), BODYTEMP_COOLING_MAX)
+		else
+			bodytemperature += min(((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX)
+
+	if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT)
+		switch(bodytemperature)
+			if(360 to 400)
+				throw_alert("temp", /obj/screen/alert/hot, 1)
+				apply_damage(HEAT_DAMAGE_LEVEL_1, BURN)
+			if(400 to 460)
+				throw_alert("temp", /obj/screen/alert/hot, 2)
+				apply_damage(HEAT_DAMAGE_LEVEL_2, BURN)
+			if(460 to INFINITY)
+				throw_alert("temp", /obj/screen/alert/hot, 3)
+				if(on_fire)
+					apply_damage(HEAT_DAMAGE_LEVEL_3, BURN)
+				else
+					apply_damage(HEAT_DAMAGE_LEVEL_2, BURN)
+
+	else if(bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
+		if(!istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
+			switch(bodytemperature)
+				if(200 to 260)
+					throw_alert("temp", /obj/screen/alert/cold, 1)
+					apply_damage(COLD_DAMAGE_LEVEL_1, BURN)
+				if(120 to 200)
+					throw_alert("temp", /obj/screen/alert/cold, 2)
+					apply_damage(COLD_DAMAGE_LEVEL_2, BURN)
+				if(-INFINITY to 120)
+					throw_alert("temp", /obj/screen/alert/cold, 3)
+					apply_damage(COLD_DAMAGE_LEVEL_3, BURN)
+		else
+			clear_alert("temp")
+
+	else
+		clear_alert("temp")
+
+	//Account for massive pressure differences
+
+	var/pressure = environment.return_pressure()
+	var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob.
+	switch(adjusted_pressure)
+		if(HAZARD_HIGH_PRESSURE to INFINITY)
+			adjustBruteLoss( min( ( (adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) )
+			throw_alert("pressure", /obj/screen/alert/highpressure, 2)
+		if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE)
+			throw_alert("pressure", /obj/screen/alert/highpressure, 1)
+		if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE)
+			clear_alert("pressure")
+		if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
+			throw_alert("pressure", /obj/screen/alert/lowpressure, 1)
+		else
+			adjustBruteLoss( LOW_PRESSURE_DAMAGE )
+			throw_alert("pressure", /obj/screen/alert/lowpressure, 2)
+
+	return
+
+/mob/living/carbon/monkey/handle_random_events()
+	if (prob(1) && prob(2))
+		emote("scratch")
+
+/mob/living/carbon/monkey/has_smoke_protection()
+	if(wear_mask)
+
 		if(wear_mask.flags_1 & BLOCK_GAS_SMOKE_EFFECT_1)
-			return 1
-
-/mob/living/carbon/monkey/handle_fire()
-	. = ..()
-	if(on_fire)
-
-		//the fire tries to damage the exposed clothes and items
-		var/list/burning_items = list()
-		//HEAD//
-		var/obj/item/clothing/head_clothes = null
-		if(wear_mask)
-			head_clothes = wear_mask
-		if(wear_neck)
-			head_clothes = wear_neck
-		if(head)
-			head_clothes = head
-		if(head_clothes)
-			burning_items += head_clothes
-
-		if(back)
-			burning_items += back
-
-		for(var/X in burning_items)
-			var/obj/item/I = X
-			if(!(I.resistance_flags & FIRE_PROOF))
-				I.take_damage(fire_stacks, BURN, "fire", 0)
-
-		bodytemperature += BODYTEMP_HEATING_MAX
-
+			return 1
+
+/mob/living/carbon/monkey/handle_fire()
+	. = ..()
+	if(on_fire)
+
+		//the fire tries to damage the exposed clothes and items
+		var/list/burning_items = list()
+		//HEAD//
+		var/obj/item/clothing/head_clothes = null
+		if(wear_mask)
+			head_clothes = wear_mask
+		if(wear_neck)
+			head_clothes = wear_neck
+		if(head)
+			head_clothes = head
+		if(head_clothes)
+			burning_items += head_clothes
+
+		if(back)
+			burning_items += back
+
+		for(var/X in burning_items)
+			var/obj/item/I = X
+			if(!(I.resistance_flags & FIRE_PROOF))
+				I.take_damage(fire_stacks, BURN, "fire", 0)
+
+		bodytemperature += BODYTEMP_HEATING_MAX
+
@@ -1,10 +0,0 @@
-diff a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm	(rejected hunks)
-@@ -121,7 +121,7 @@
- 	if(I.loc != src)
- 		I.forceMove(src)
- 	modules += I
-	I.flags |= NODROP
-+	I.flags_1 |= NODROP_1
- 	I.mouse_opacity = MOUSE_OPACITY_OPAQUE
- 	if(nonstandard)
- 		added_modules += I
@@ -0,0 +1,11 @@
+/datum/emote/sound/gorilla
+	mob_type_allowed_typecache = /mob/living/simple_animal/hostile/gorilla
+	mob_type_blacklist_typecache = list()
+
+/datum/emote/sound/gorilla/ooga
+	key = "ooga"
+	key_third_person = "oogas"
+	message = "oogas."
+	message_param = "oogas at %t."
+	sound = "sound/creatures/gorilla.ogg"
+
@@ -0,0 +1,77 @@
+#define GORILLA_HANDS_LAYER 1
+#define GORILLA_TOTAL_LAYERS 1
+
+/mob/living/simple_animal/hostile/gorilla
+	name = "Gorilla"
+	desc = "A ground-dwelling, predominantly herbivorous ape that inhabits the forests of central Africa."
+	icon = 'icons/mob/gorilla.dmi'
+	icon_state = "crawling"
+	icon_state = "crawling"
+	icon_living = "crawling"
+	icon_dead = "dead"
+	speak_chance = 80
+	maxHealth = 220
+	health = 220
+	loot = list(/obj/effect/gibspawner/generic)
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/gorilla = 4)
+	response_help  = "prods"
+	response_disarm = "challenges"
+	response_harm   = "thumps"
+	speed = 1
+	melee_damage_lower = 15
+	melee_damage_upper = 18
+	damage_coeff = list(BRUTE = 1, BURN = 1.5, TOX = 1.5, CLONE = 0, STAMINA = 0, OXY = 1.5)
+	obj_damage = 20
+	environment_smash = 2
+	attacktext = "pummels"
+	attack_sound = 'sound/weapons/punch1.ogg'
+	dextrous = TRUE
+	possible_a_intents = list(INTENT_HELP, INTENT_GRAB, INTENT_DISARM, INTENT_HARM)
+	faction = list("jungle")
+	robust_searching = TRUE
+	stat_attack = UNCONSCIOUS
+	minbodytemp = 270
+	maxbodytemp = 350
+	var/list/gorilla_overlays[GORILLA_TOTAL_LAYERS]
+
+// Gorillas like to dismember limbs from unconcious mobs.
+// Returns null when the target is not an unconcious carbon mob; a list of limbs (possibly empty) otherwise.
+/mob/living/simple_animal/hostile/gorilla/proc/target_bodyparts(atom/the_target)
+	var/list/parts = list()
+	if(iscarbon(the_target))
+		var/mob/living/carbon/C = the_target
+		if(C.stat >= UNCONSCIOUS)
+			for(var/X in C.bodyparts)
+				var/obj/item/bodypart/BP = X
+				if(BP.body_part != HEAD && BP.body_part != CHEST)
+					if(BP.dismemberable)
+						parts += BP
+			return parts
+
+/mob/living/simple_animal/hostile/gorilla/AttackingTarget()
+	var/list/parts = target_bodyparts(target)
+	if(parts)
+		if(!parts.len)
+			return FALSE
+		var/obj/item/bodypart/BP = pick(parts)
+		BP.dismember()
+		return ..()
+	. = ..()
+	if(. && isliving(target))
+		var/mob/living/L = target
+		if(prob(80))
+			var/atom/throw_target = get_edge_target_turf(L, dir)
+			L.throw_at(throw_target, rand(1,2), 7, src)
+		else
+			L.Knockdown(20)
+			visible_message("<span class='danger'>[src] knocks [L] down!</span>")
+
+/mob/living/simple_animal/hostile/gorilla/CanAttack(atom/the_target)
+	var/list/parts = target_bodyparts(target)
+	return ..() && !istype(the_target, /mob/living/carbon/monkey) && (!parts  || parts.len > 3)
+
+/mob/living/simple_animal/hostile/gorilla/handle_automated_speech(override)
+	if(speak_chance && (override || prob(speak_chance)))
+		playsound(src, "sound/creatures/gorilla.ogg", 200)
+	..()
+
@@ -0,0 +1,55 @@
+/mob/living/simple_animal/hostile/gorilla/proc/apply_overlay(cache_index)
+	. = gorilla_overlays[cache_index]
+	if(.)
+		add_overlay(.)
+
+/mob/living/simple_animal/hostile/gorilla/proc/remove_overlay(cache_index)
+	var/I = gorilla_overlays[cache_index]
+	if(I)
+		cut_overlay(I)
+		gorilla_overlays[cache_index] = null
+
+/mob/living/simple_animal/hostile/gorilla/update_inv_hands()
+	cut_overlays("standing_overlay")
+	remove_overlay(GORILLA_HANDS_LAYER)
+
+	var/standing = FALSE
+	for(var/I in held_items)
+		if(I)
+			standing = TRUE
+			break
+	if(!standing)
+		if(stat != DEAD)
+			icon_state = "crawling"
+			speed = 1
+		return ..()
+	if(stat != DEAD)
+		icon_state = "standing"
+		speed = 3 // Gorillas are slow when standing up.
+
+	var/list/hands_overlays = list()
+
+	var/obj/item/l_hand = get_item_for_held_index(1)
+	var/obj/item/r_hand = get_item_for_held_index(2)
+
+	if(r_hand)
+		var/r_state = r_hand.item_state ? r_hand.item_state : r_hand.icon_state
+		var/mutable_appearance/r_hand_overlay = r_hand.build_worn_icon(state = r_state, default_layer = GORILLA_HANDS_LAYER, default_icon_file = r_hand.righthand_file, isinhands = TRUE)
+		r_hand_overlay.pixel_y -= 1
+		hands_overlays += r_hand_overlay
+
+	if(l_hand)
+		var/l_state = l_hand.item_state ? l_hand.item_state : l_hand.icon_state
+		var/mutable_appearance/l_hand_overlay = l_hand.build_worn_icon(state = l_state, default_layer = GORILLA_HANDS_LAYER, default_icon_file = l_hand.lefthand_file, isinhands = TRUE)
+		l_hand_overlay.pixel_y -= 1
+		hands_overlays += l_hand_overlay
+
+	if(hands_overlays.len)
+		gorilla_overlays[GORILLA_HANDS_LAYER] = hands_overlays
+	apply_overlay(GORILLA_HANDS_LAYER)
+	add_overlay("standing_overlay")
+	return ..()
+
+/mob/living/simple_animal/hostile/gorilla/regenerate_icons()
+	update_inv_hands()
+
@@ -1,10 +0,0 @@
-diff a/code/modules/mob/living/simple_animal/hostile/jungle_mobs.dm b/code/modules/mob/living/simple_animal/hostile/jungle_mobs.dm	(rejected hunks)
-@@ -80,7 +80,7 @@
- /obj/item/restraints/legcuffs/beartrap/mega_arachnid
- 	name = "fleshy restraints"
- 	desc = "Used by mega arachnids to immobilize their prey."
-	flags = DROPDEL
-+	flags_1 = DROPDEL_1
- 	icon_state = "tentacle_end"
- 	icon = 'icons/obj/projectiles.dmi'
- 
@@ -386,14 +386,14 @@
 	else
 		..()

-/mob/living/simple_animal/update_canmove()
+/mob/living/simple_animal/update_canmove(value_otherwise = TRUE)
 	if(IsUnconscious() || IsStun() || IsKnockdown() || stat || resting)
 		drop_all_held_items()
-		canmove = 0
+		canmove = FALSE
 	else if(buckled)
-		canmove = 0
+		canmove = FALSE
 	else
-		canmove = 1
+		canmove = value_otherwise
 	update_transform()
 	update_action_buttons_icon()
 	return canmove
@@ -495,6 +495,30 @@
 	. = new_corgi
 	qdel(src)

+/mob/living/carbon/proc/gorillize()
+	if(notransform)
+		return
+
+	var/Itemlist = get_equipped_items()
+	Itemlist += held_items
+	for(var/obj/item/W in Itemlist)
+		dropItemToGround(W, TRUE)
+
+	regenerate_icons()
+	notransform = TRUE
+	canmove = FALSE
+	icon = null
+	invisibility = INVISIBILITY_MAXIMUM
+	var/mob/living/simple_animal/hostile/gorilla/new_gorilla = new (get_turf(src))
+	new_gorilla.a_intent = INTENT_HARM
+	if(mind)
+		mind.transfer_to(new_gorilla)
+	else
+		new_gorilla.key = key
+	to_chat(new_gorilla, "<B>You are now a gorilla. Ooga ooga!</B>")
+	. = new_gorilla
+	qdel(src)
+
 /mob/living/carbon/human/Animalize()

 	var/list/mobtypes = typesof(/mob/living/simple_animal)
@@ -1,10 +0,0 @@
-diff a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm	(rejected hunks)
-@@ -125,7 +125,7 @@
- 	update_icon()
- 
- /obj/machinery/modular_computer/attackby(var/obj/item/W as obj, mob/user)
-	if(cpu && !(flags & NODECONSTRUCT))
-+	if(cpu && !(flags_1 & NODECONSTRUCT_1))
- 		return cpu.attackby(W, user)
- 	return ..()
- 
@@ -1,10 +0,0 @@
-diff a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm	(rejected hunks)
-@@ -5,7 +5,7 @@
- 	throw_speed = 3
- 	var/signed = FALSE
- 	var/datum/mind/target
-	flags = NOBLUDGEON
-+	flags_1 = NOBLUDGEON_1
- 
- /obj/item/paper/contract/proc/update_text()
- 	return
@@ -1,23 +0,0 @@
-diff a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm	(rejected hunks)
-@@ -91,18 +91,18 @@
- 	info = "...EMPTY HALLS...USELESS SPACE..."
- 
- 
-///////////	Centcom
-+///////////	CentCom
- 
- /obj/item/paper/fluff/stations/centcom/disk_memo
- 	name = "memo"
- 	info = "GET DAT FUKKEN DISK"
- 
- /obj/item/paper/fluff/stations/centcom/broken_evac
-	info = "Due to circumstances beyond our control, your Emergency Evacuation Shuttle is out of service.<br><br>We apologize for the inconvenience this may cause you.<br><br>Please enjoy the use of this complementary book.<br><br>Sincerely,<br>Centcom Operations Demolitions Examination Retribution Bugfixing Underlining Services"
-+	info = "Due to circumstances beyond our control, your Emergency Evacuation Shuttle is out of service.<br><br>We apologize for the inconvenience this may cause you.<br><br>Please enjoy the use of this complementary book.<br><br>Sincerely,<br>CentCom Operations Demolitions Examination Retribution Bugfixing Underlining Services"
- 
- /obj/item/paper/fluff/stations/centcom/bulletin
- 	name = "paper- 'Official Bulletin'"
-	info = "<BR>Centcom Security<BR>Port Division<BR>Official Bulletin<BR><BR>Inspector,<BR>There is an emergency shuttle arriving today.<BR><BR>Approval is restricted to Nanotrasen employees only. Deny all other entrants.<BR><BR>Centcom Port Commissioner"
-+	info = "<BR>CentCom Security<BR>Port Division<BR>Official Bulletin<BR><BR>Inspector,<BR>There is an emergency shuttle arriving today.<BR><BR>Approval is restricted to Nanotrasen employees only. Deny all other entrants.<BR><BR>CentCom Port Commissioner"
- 
- 
- ///////////	Lavaland
@@ -1,10 +0,0 @@
-diff a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm	(rejected hunks)
-@@ -168,7 +168,7 @@
-  */
- /obj/item/pen/sleepy
- 	origin_tech = "engineering=4;syndicate=2"
-	container_type = OPENCONTAINER
-+	container_type = OPENCONTAINER_1
- 
- 
- /obj/item/pen/sleepy/attack(mob/living/M, mob/user)
@@ -1,10 +0,0 @@
-diff a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm	(rejected hunks)
-@@ -497,7 +497,7 @@
- 	desc = "The perfect showcase for your favorite deathtrap memories."
- 	icon = 'icons/obj/decals.dmi'
- 	materials = list()
-	flags = 0
-+	flags_1 = 0
- 	icon_state = "frame-empty"
- 	result_path = /obj/structure/sign/picture_frame
- 	var/obj/item/photo/displayed
@@ -1,12 +0,0 @@
-diff a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm	(rejected hunks)
-@@ -445,8 +445,8 @@
- 	name = "turret controls"
- 	icon_state = "offhand"
- 	w_class = WEIGHT_CLASS_HUGE
-	flags = ABSTRACT | NODROP
-	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON
-+	flags_1 = ABSTRACT_1 | NODROP_1
-+	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON_1
- 	var/delay = 0
- 
- /obj/item/turret_control/afterattack(atom/targeted_atom, mob/user)
@@ -1,10 +0,0 @@
-diff a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm	(rejected hunks)
-@@ -17,7 +17,7 @@
- 	var/active = 0
- 	var/strength = 0
- 	var/powered = 0
-	mouse_opacity = 2
-+	mouse_opacity = MOUSE_OPACITY_OPAQUE
- 
- /obj/machinery/particle_accelerator/control_box/Initialize()
- 	. = ..()
@@ -1,10 +0,0 @@
-diff a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm	(rejected hunks)
-@@ -524,7 +524,7 @@
- 			R.receive_pulse(power * (1 + power_transmission_bonus)/10 * freon_transmit_modifier)
- 
- /obj/machinery/power/supermatter_shard/attackby(obj/item/W, mob/living/user, params)
-	if(!istype(W) || (W.flags & ABSTRACT) || !istype(user))
-+	if(!istype(W) || (W.flags_1 & ABSTRACT_1) || !istype(user))
- 		return
- 	if(istype(W, /obj/item/scalpel/supermatter))
- 		playsound(src, W.usesound, 100, 1)
@@ -1,10 +0,0 @@
-diff a/code/modules/projectiles/guns/beam_rifle.dm b/code/modules/projectiles/guns/beam_rifle.dm	(rejected hunks)
-@@ -715,7 +715,7 @@
- 	light_range = 2
- 	light_color = "#00ffff"
- 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-	flags = ABSTRACT
-+	flags_1 = ABSTRACT_1
- 	appearance_flags = 0
- 
- /obj/effect/projectile_beam/proc/scale_to(nx,ny,override=TRUE)
@@ -1,10 +0,0 @@
-diff a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm	(rejected hunks)
-@@ -6,7 +6,7 @@
- 	w_class = WEIGHT_CLASS_BULKY
- 	force = 10
- 	modifystate = TRUE
-	flags =  CONDUCT
-+	flags_1 =  CONDUCT_1
- 	slot_flags = SLOT_BACK
- 	ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
- 	cell_type = "/obj/item/stock_parts/cell/pulse"
@@ -101,7 +101,7 @@
 				qdel(dummy)
 				return 0
 		for(var/obj/effect/ebeam/medical/B in turf)// Don't cross the str-beams!
-			if(B.owner != current_beam)
+			if(B.owner.origin != current_beam.origin)
 				explosion(B.loc,0,3,5,8)
 				qdel(dummy)
 				return 0
--- a/Show More
+++ b/Show More