updates

.gitignore

@@ -163,7 +163,8 @@ $RECYCLE.BIN/
 .LSOverride
 
 # Icon must end with two \r
-Icon
+Icon
+
 
 # Thumbnails
 ._*
@@ -184,3 +185,7 @@ Temporary Items
 .apdisk
 
 *.before
+
+# Ignore changes to config files, but not presets. Presets should be set in /config/initial/
+/config/*
+!/config/*/

_maps/map_files/generic/lavaland.dmm

@@ -713,7 +713,7 @@
 	},
 /area/mine/laborcamp/security)
 "bC" = (
-/obj/structure/chair/office/dark,
+/obj/structure/chair/withwheels/office/dark,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 4;

_maps/map_files/generic/z2.dmm

@@ -1619,7 +1619,7 @@
 /turf/open/floor/plasteel/black,
 /area/centcom/ferry)
 "eQ" = (
-/obj/structure/chair/office/dark,
+/obj/structure/chair/withwheels/office/dark,
 /obj/effect/landmark{
 	name = "Emergencyresponseteam"
 	},
@@ -1630,7 +1630,7 @@
 /turf/open/floor/vault,
 /area/centcom/ferry)
 "eS" = (
-/obj/structure/chair/office/dark{
+/obj/structure/chair/withwheels/office/dark{
 	dir = 8
 	},
 /obj/effect/landmark{
@@ -1639,7 +1639,7 @@
 /turf/open/floor/plasteel/black,
 /area/centcom/ferry)
 "eT" = (
-/obj/structure/chair/office/dark{
+/obj/structure/chair/withwheels/office/dark{
 	dir = 4
 	},
 /obj/effect/landmark{
@@ -1667,7 +1667,7 @@
 	},
 /area/centcom/ferry)
 "eY" = (
-/obj/structure/chair/office/dark,
+/obj/structure/chair/withwheels/office/dark,
 /turf/open/floor/plasteel/freezer{
 	dir = 2
 	},
@@ -1723,7 +1723,7 @@
 	},
 /area/centcom/ferry)
 "ff" = (
-/obj/structure/chair/office/dark{
+/obj/structure/chair/withwheels/office/dark{
 	dir = 1
 	},
 /obj/effect/landmark{
@@ -1822,7 +1822,7 @@
 /turf/open/floor/wood,
 /area/centcom/ferry)
 "ft" = (
-/obj/structure/chair/office/dark,
+/obj/structure/chair/withwheels/office/dark,
 /turf/open/floor/wood,
 /area/centcom/ferry)
 "fu" = (
@@ -2057,7 +2057,7 @@
 	},
 /area/centcom/evac)
 "gh" = (
-/obj/structure/chair/office/dark,
+/obj/structure/chair/withwheels/office/dark,
 /turf/open/floor/plasteel/black,
 /area/centcom/evac)
 "gi" = (
@@ -2245,7 +2245,7 @@
 	},
 /area/centcom/evac)
 "gP" = (
-/obj/structure/chair/office/dark,
+/obj/structure/chair/withwheels/office/dark,
 /turf/open/floor/plasteel,
 /area/centcom/evac)
 "gQ" = (
@@ -2394,7 +2394,7 @@
 /turf/open/floor/plasteel/black,
 /area/centcom/control)
 "hp" = (
-/obj/structure/chair/office/dark{
+/obj/structure/chair/withwheels/office/dark{
 	dir = 8
 	},
 /turf/open/floor/plasteel/black,
@@ -2698,7 +2698,7 @@
 /turf/open/floor/plasteel,
 /area/tdome/tdomeobserve)
 "in" = (
-/obj/structure/chair/office/dark{
+/obj/structure/chair/withwheels/office/dark{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
@@ -5744,7 +5744,7 @@
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "rR" = (
-/obj/structure/chair/office/light{
+/obj/structure/chair/withwheels/office/light{
 	dir = 4
 	},
 /turf/open/floor/mineral/titanium,

_maps/map_files/generic/z5.dmm

@@ -2247,7 +2247,7 @@
 /turf/open/floor/plasteel,
 /area/mine/laborcamp/security)
 "gn" = (
-/obj/structure/chair/office/dark,
+/obj/structure/chair/withwheels/office,
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;

_maps/tgstation2.dm

@@ -4,7 +4,7 @@
 
 		#define MINETYPE "lavaland"
 
-        #include "map_files\TgStation\tgstation.2.1.3.dmm"
+        #include "map_files\TgStation2\tgstation.2.1.3.dmm"
         #include "map_files\generic\z2.dmm"
         #include "map_files\generic\z3.dmm"
         #include "map_files\generic\z4.dmm"
@@ -16,7 +16,7 @@
 		#include "map_files\generic\z10.dmm"
 		#include "map_files\generic\z11.dmm"
 
-		#define MAP_PATH "map_files/TgStation"
+		#define MAP_PATH "map_files/TgStation2"
         #define MAP_FILE "tgstation.2.1.3.dmm"
         #define MAP_NAME "Box Station"
 

code/__DEFINES/flags.dm

@@ -26,11 +26,14 @@
 #define OPENCONTAINER	4096	// is an open container for chemistry purposes
 #define HEADBANGPROTECT		4096
 
+#define INJECTONLY		8192
+
 // BLOCK_GAS_SMOKE_EFFECT only used in masks at the moment.
-#define BLOCK_GAS_SMOKE_EFFECT 8192	// blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! (NOTE: flag shared with THICKMATERIAL)
-#define THICKMATERIAL 8192		//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. (NOTE: flag shared with BLOCK_GAS_SMOKE_EFFECT)
-#define DROPDEL			16384 // When dropped, it calls qdel on itself
-#define HOLOGRAM		32768	// HOlodeck shit should not be used in any fucking things
+#define BLOCK_GAS_SMOKE_EFFECT 8192	 // blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! (NOTE: flag shared with THICKMATERIAL)
+#define THICKMATERIAL          8192  //prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. (NOTE: flag shared with BLOCK_GAS_SMOKE_EFFECT)
+
+#define DROPDEL			       16384 // When dropped, it calls qdel on itself
+#define HOLOGRAM		       32768 // Holodeck shit should not be used in any fucking things
 
 //turf-only flags
 #define NOJAUNT		1
@@ -87,6 +90,7 @@
 #define DRONE 32
 #define SWARMER 64
 #define RATVAR 128
+#define ZOMBIE 256
 
 // Flags for reagents
 #define REAGENT_NOREACT 1

code/__DEFINES/machines.dm

@@ -22,4 +22,5 @@
 #define CRAFTLATHE	8	//Uses fuck if I know. For use eventually.
 #define MECHFAB		16 //Remember, objects utilising this flag should have construction_time and construction_cost vars.
 #define BIOGENERATOR 32 //Uses biomass
+#define ATMOSLATHE   64 // Used for crafting atmos items in atmoslathe
 //Note: More then one of these can be added to a design but imprinter and lathe designs are incompatable.

code/_onclick/hud/_defines.dm

@@ -68,6 +68,7 @@
 //Lower right, persistant menu
 #define ui_drop_throw "EAST-1:28,SOUTH+1:7"
 #define ui_pull_resist "EAST-2:26,SOUTH+1:7"
+#define ui_grab "EAST-3:24,SOUTH+1:7"
 #define ui_movi "EAST-2:26,SOUTH:5"
 #define ui_acti "EAST-3:24,SOUTH:5"
 #define ui_zonesel "EAST-1:28,SOUTH:5"

code/_onclick/hud/hud.dm

@@ -31,6 +31,7 @@
 	var/obj/screen/zone_select
 	var/obj/screen/pull_icon
 	var/obj/screen/throw_icon
+	var/obj/screen/grab_icon
 	var/obj/screen/module_store_icon
 
 	var/list/static_inventory = list() //the screen objects which are static

code/_onclick/hud/human.dm

@@ -109,6 +109,11 @@
 	static_inventory += using
 	action_intent = using
 
+	grab_icon = new /obj/screen/grab_ind()
+	grab_icon.icon_state = "grab[mymob.grab_state]"
+	grab_icon.screen_loc = ui_grab
+	static_inventory += grab_icon
+
 	using = new /obj/screen/mov_intent()
 	using.icon = ui_style
 	using.icon_state = (mymob.m_intent == "run" ? "running" : "walking")

code/_onclick/hud/screen_objects.dm

@@ -46,6 +46,23 @@
 		M.swap_hand()
 	return 1
 
+/obj/screen/grab_ind
+	name = "reinforce grab"
+	icon_state = "grab"
+	layer = HUD_LAYER
+
+/obj/screen/grab_ind/Click()
+	var/mob/living/user = usr
+	if(user.next_move > world.time)
+		return
+	if(ismob(user.pulling))
+		var/mob/living/grabbedguy = user.pulling
+		grabbedguy.grabbedby(user)
+		update_icon(user)
+
+/obj/screen/grab_ind/update_icon(mob/user)
+	icon_state = "grab[user.grab_state]"
+
 /obj/screen/inventory/craft
 	name = "crafting menu"
 	icon = 'icons/mob/screen_midnight.dmi'

code/datums/wires/poolcontroller.dm

@@ -0,0 +1,56 @@
+#define POOL_WIRE_DRAIN "drain"
+
+/datum/wires/poolcontroller
+	holder_type = /obj/machinery/poolcontroller
+
+/datum/wires/poolcontroller/New(atom/holder)
+	wires = list(
+		POOL_WIRE_DRAIN, WIRE_HACK, WIRE_ELECTRIFY
+	)
+	add_duds(2)
+	..()
+
+/datum/wires/poolcontroller/interact(var/mob/living/user)
+	if(interactable(user))
+		var/obj/machinery/poolcontroller/P = holder
+		P.attack_hand(user)
+
+/datum/wires/poolcontroller/interactable(var/mob/living/L)
+	var/obj/machinery/poolcontroller/P = holder
+	if(!istype(L, /mob/living/silicon))
+		if(P.seconds_electrified)
+			if(P.shock(L, 100))
+				return 0
+	if(P.panel_open)
+		return 1
+	return 0
+
+/datum/wires/poolcontroller/on_pulse(wire)
+	var/obj/machinery/poolcontroller/P = holder
+	switch(wire)
+		if(POOL_WIRE_DRAIN)
+			P.drainable = 0
+		if(WIRE_HACK)
+			if(P.emagged)
+				P.emagged = 0
+			if(!P.emagged)
+				P.emagged = 1
+		if(WIRE_ELECTRIFY)
+			P.seconds_electrified = 30
+
+/datum/wires/poolcontroller/on_cut(wire, mend)
+	var/obj/machinery/poolcontroller/P = holder
+	switch(wire)
+		if(POOL_WIRE_DRAIN)
+			if(mend)
+				P.drainable = 0
+			else
+				P.drainable = 1
+		if(WIRE_HACK)
+			if(mend)
+				P.emagged = 0
+		if(WIRE_ELECTRIFY)
+			if(mend)
+				P.seconds_electrified = 0
+			else
+				P.seconds_electrified = -1