Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps

_maps/interiors/tank.dmm

@@ -0,0 +1,157 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/open/space/basic,
+/area/interior/tank)
+"b" = (
+/turf/closed/interior/tank/door,
+/area/interior/tank)
+"d" = (
+/obj/structure/bed/chair/vehicle_driver_seat{
+	pixel_x = 11;
+	pixel_y = -6
+	},
+/turf/open/interior/tank/twentytwo,
+/area/interior/tank)
+"f" = (
+/obj/machinery/telecomms/relay/preset/telecomms/onboard/nondense,
+/turf/closed/interior/tank/twentyone,
+/area/interior/tank)
+"h" = (
+/turf/closed/interior/tank/five,
+/area/interior/tank)
+"j" = (
+/turf/closed/interior/tank/one,
+/area/interior/tank)
+"k" = (
+/turf/closed/interior/tank/twenty,
+/area/interior/tank)
+"l" = (
+/turf/open/interior/tank/nine,
+/area/interior/tank)
+"n" = (
+/turf/closed/interior/tank/eighteen,
+/area/interior/tank)
+"r" = (
+/turf/closed/interior/tank/twentythree,
+/area/interior/tank)
+"s" = (
+/turf/open/interior/tank/sixteen,
+/area/interior/tank)
+"t" = (
+/turf/closed/interior/tank/twentyfour,
+/area/interior/tank)
+"u" = (
+/obj/structure/gun_breech{
+	pixel_x = -13;
+	pixel_y = -4
+	},
+/turf/closed/interior/tank/seventeen,
+/area/interior/tank)
+"v" = (
+/obj/structure/bed/chair/loader_seat{
+	pixel_y = -5
+	},
+/obj/structure/periscope,
+/turf/open/interior/tank/fifteen,
+/area/interior/tank)
+"w" = (
+/turf/closed/interior/tank/twentyseven,
+/area/interior/tank)
+"x" = (
+/turf/open/interior/tank/eight,
+/area/interior/tank)
+"z" = (
+/turf/closed/interior/tank/nineteen,
+/area/interior/tank)
+"A" = (
+/obj/structure/ammo_rack/primary{
+	pixel_x = 1;
+	pixel_y = -10
+	},
+/turf/closed/interior/tank/four,
+/area/interior/tank)
+"D" = (
+/turf/closed/interior/tank/twentyeight,
+/area/interior/tank)
+"E" = (
+/turf/closed/interior/tank/twelve,
+/area/interior/tank)
+"H" = (
+/turf/closed/interior/tank/twentyfive,
+/area/interior/tank)
+"I" = (
+/turf/closed/interior/tank/thirteen,
+/area/interior/tank)
+"M" = (
+/turf/closed/interior/tank/twentysix,
+/area/interior/tank)
+"N" = (
+/turf/open/interior/tank/ten,
+/area/interior/tank)
+"S" = (
+/obj/structure/bed/chair/vehicle_gunner_seat{
+	pixel_x = -3;
+	pixel_y = -5
+	},
+/turf/open/interior/tank/eleven,
+/area/interior/tank)
+"V" = (
+/obj/structure/ammo_rack/secondary{
+	pixel_x = 11;
+	pixel_y = -18
+	},
+/turf/closed/interior/tank/two,
+/area/interior/tank)
+"X" = (
+/turf/closed/interior/tank/six,
+/area/interior/tank)
+"Y" = (
+/obj/structure/gun_breech/secondary,
+/turf/open/interior/tank/fourteen,
+/area/interior/tank)
+"Z" = (
+/turf/closed/interior/tank/three,
+/area/interior/tank)
+
+(1,1,1) = {"
+j
+b
+I
+z
+a
+"}
+(2,1,1) = {"
+V
+x
+Y
+k
+a
+"}
+(3,1,1) = {"
+Z
+l
+v
+f
+H
+"}
+(4,1,1) = {"
+A
+N
+s
+d
+M
+"}
+(5,1,1) = {"
+h
+S
+u
+r
+w
+"}
+(6,1,1) = {"
+X
+E
+n
+t
+D
+"}

_maps/map_files/Campaign maps/nt_base/nt_base.dmm

@@ -449,7 +449,7 @@
 /turf/open/floor/plating/ground/ice,
 /area/gelida/caves/west_caves)
 "arF" = (
-/obj/structure/holohoop{
+/obj/structure/hoop{
 	dir = 4;
 	id = "lvbasketball";
 	side = "left"
@@ -1752,7 +1752,7 @@
 	},
 /area/gelida/landing_zone_2)
 "bmp" = (
-/obj/structure/holohoop{
+/obj/structure/hoop{
 	pixel_y = 27
 	},
 /obj/item/toy/beach_ball/holoball{
@@ -9771,7 +9771,7 @@
 /turf/open/floor/prison/sterilewhite,
 /area/gelida/landing_zone_forecon/UD6_Tornado)
 "hju" = (
-/obj/structure/holohoop{
+/obj/structure/hoop{
 	dir = 8;
 	id = "lvbasketball";
 	side = "right"
@@ -23202,7 +23202,7 @@
 /turf/open/floor/prison/whitegreen/full,
 /area/gelida/indoors/a_block/fitness)
 "qVp" = (
-/obj/structure/holohoop,
+/obj/structure/hoop,
 /turf/open/floor/prison/whitepurple/full{
 	dir = 4
 	},
@@ -24128,7 +24128,7 @@
 	pixel_x = 7;
 	pixel_y = -9
 	},
-/obj/structure/holohoop{
+/obj/structure/hoop{
 	dir = 4
 	},
 /turf/open/floor/plating/ground/snow/layer0,

_maps/map_files/Campaign maps/patricks_rest/patricks_rest.dmm

@@ -3630,7 +3630,7 @@
 	},
 /area/patricks_rest/ground/colonyn)
 "pX" = (
-/obj/structure/holohoop{
+/obj/structure/hoop{
 	dir = 8;
 	id = "lvbasketball";
 	side = "right"
@@ -9825,7 +9825,7 @@
 	},
 /area/patricks_rest/ground/colonyn)
 "Uk" = (
-/obj/structure/holohoop{
+/obj/structure/hoop{
 	dir = 4;
 	id = "lvbasketball";
 	side = "left"

_maps/map_files/Orion_Military_Outpost/orionoutpost.dmm

@@ -24211,7 +24211,7 @@ kb
 IQ
 Tm
 Tm
-An
+Tm
 Tm
 kb
 Tm
@@ -24343,7 +24343,7 @@ kb
 cR
 Tm
 Tm
-Tm
+An
 cR
 kb
 Tm

_maps/map_files/gelida_iv/gelida_iv.dmm

@@ -524,7 +524,7 @@
 /turf/open/floor/prison/plate,
 /area/gelida/outdoors/colony_streets/north_street)
 "arF" = (
-/obj/structure/holohoop{
+/obj/structure/hoop{
 	dir = 4;
 	id = "lvbasketball";
 	side = "left"
@@ -1952,7 +1952,7 @@
 	},
 /area/gelida/landing_zone_2)
 "bmp" = (
-/obj/structure/holohoop{
+/obj/structure/hoop{
 	pixel_y = 27
 	},
 /obj/item/toy/beach_ball/holoball{
@@ -10989,7 +10989,7 @@
 /turf/open/floor/prison/sterilewhite,
 /area/gelida/landing_zone_forecon/UD6_Tornado)
 "hju" = (
-/obj/structure/holohoop{
+/obj/structure/hoop{
 	dir = 8;
 	id = "lvbasketball";
 	side = "right"
@@ -25827,7 +25827,7 @@
 /turf/open/floor/prison/whitegreen/full,
 /area/gelida/indoors/a_block/fitness)
 "qVp" = (
-/obj/structure/holohoop,
+/obj/structure/hoop,
 /turf/open/floor/prison/whitepurple/full{
 	dir = 4
 	},
@@ -26914,7 +26914,7 @@
 	pixel_x = 7;
 	pixel_y = -9
 	},
-/obj/structure/holohoop{
+/obj/structure/hoop{
 	dir = 4
 	},
 /turf/open/floor/plating/ground/snow/layer0,

_maps/shuttles/minidropship_standard.dmm

@@ -52,6 +52,9 @@
 	name = "inner door-control"
 	},
 /obj/item/stack/barbed_wire/half_stack,
+/obj/structure/closet/walllocker/hydrant/extinguisher{
+	pixel_x = -25
+	},
 /turf/open/floor/mainship/mono,
 /area/shuttle/minidropship)
 "n" = (
@@ -78,9 +81,6 @@
 /obj/machinery/vending/nanomed/tadpolemed{
 	pixel_x = 5
 	},
-/obj/structure/closet/walllocker/hydrant/extinguisher{
-	pixel_x = -25
-	},
 /turf/open/floor/mainship/mono,
 /area/shuttle/minidropship)
 "s" = (

code/__DEFINES/action.dm

@@ -24,6 +24,8 @@
 #define VREF_MUTABLE_BANE_CHARGES "VREF_BANE_CHARGES"
 /// A reference for the build counter of a xeno
 #define VREF_MUTABLE_BUILDING_COUNTER "VREF_BUILD_COUNTER"
+//A reference for the special resin build counter of a xeno
+#define VREF_MUTABLE_SPECIAL_RESIN_COUNTER "VREF_SPECIAL_RESIN_COUNTER"
 // extra reference for the amount of landslide charges we have
 #define VREF_MUTABLE_LANDSLIDE "VREF_LANDSLIDE"
 // extra reference for the amount of earth pillars we have

code/__DEFINES/colors.dm

@@ -278,3 +278,8 @@ Important note: colors can end up significantly different from the basic html pi
 #define LIGHT_COLOR_EMISSIVE_RED "#fa6464"
 #define LIGHT_COLOR_EMISSIVE_YELLOW "#f0fa64"
 #define LIGHT_COLOR_EMISSIVE_ORANGE "#faac64"
+
+//Colors used by special resin walls.
+#define COLLOR_WALL_BULLETPROOF "#ed99f6"
+#define COLOR_WALL_FIREPROOF "#ff696e"
+#define COLOR_WALL_HARDY "#6699ff"

code/__DEFINES/dcs/signals.dm

@@ -8,6 +8,7 @@
 
 ///from base of datum/controller/subsystem/mapping/proc/add_new_zlevel(): (list/args)
 #define COMSIG_GLOB_NEW_Z "!new_z"
+#define COMSIG_GLOB_DEPLOY_TIMELOCK_ENDED "!deploy_timelock_ended"
 #define COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE "!open_timed_shutters_late"
 #define COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND "!open_timed_shutters_xeno_hivemind"
 #define COMSIG_GLOB_OPEN_TIMED_SHUTTERS_CRASH "!open_timed_shutters_crash"
@@ -211,6 +212,8 @@
 #define COMSIG_ATOM_ATTACK_GHOST "atom_attack_ghost"			//from base of atom/attack_ghost(): (mob/dead/observer/ghost)
 	#define COMPONENT_NO_ATTACK_HAND (1<<0)						//works on all attack_hands.
 #define COMSIG_ATOM_ATTACK_POWERLOADER "atom_attack_powerloader"//from base of atom/attack_powerloader: (mob/living/user, obj/item/powerloader_clamp/attached_clamp)
+///from base of atom/emp_act(): (severity)
+#define COMSIG_ATOM_EMP_ACT "atom_emp_act"
 #define COMSIG_ATOM_EXAMINE "atom_examine"					//from base of atom/examine(): (/mob)
 ///from base of atom/get_examine_name(): (/mob, list/overrides)
 #define COMSIG_ATOM_GET_EXAMINE_NAME "atom_examine_name"
@@ -680,6 +683,8 @@
 
 #define COMSIG_XENO_PSYCHIC_LINK_REMOVED "xeno_psychic_link_removed"
 
+#define COMSIG_XENOMORPH_LEAP_BUMP "xenomorph_leap_bump" //from /mob/living/carbon/xenomorph/bump
+
 //human signals
 #define COMSIG_CLICK_QUICKEQUIP "click_quickequip"
 
@@ -769,6 +774,7 @@
 #define COMSIG_XENOABILITY_DROP_PLANT "xenoability_drop_plant"
 #define COMSIG_XENOABILITY_CHOOSE_PLANT "xenoability_choose_plant"
 #define COMSIG_XENOABILITY_SECRETE_RESIN "xenoability_secrete_resin"
+#define COMSIG_XENOABILITY_SECRETE_SPECIAL_RESIN "xenoability_secrete_special_resin"
 #define COMSIG_XENOABILITY_PLACE_ACID_WELL "place_acid_well"
 #define COMSIG_XENOABILITY_EMIT_RECOVERY "xenoability_emit_recovery"
 #define COMSIG_XENOABILITY_EMIT_WARDING "xenoability_emit_warding"
@@ -1092,3 +1098,4 @@
 #define COMSIG_PUPPET_CHANGE_ALL_ORDER "puppetglobalorder"
 
 #define COMSIG_CAVE_INTERFERENCE_CHECK "cave_interference_check" //! Cave comms interference check signal.
+

code/__DEFINES/loadout.dm

@@ -82,6 +82,7 @@ GLOBAL_LIST_INIT(engineer_gear_listed_products, list(
 		/obj/item/storage/box/explosive_mines = list(CAT_ENGSUP, "M20 mine box", 18, "black"),
 		/obj/item/storage/box/explosive_mines/large = list(CAT_ENGSUP, "Large M20 mine box", 35, "black"),
 		/obj/item/minelayer = list(CAT_ENGSUP, "M21 APRDS \"Minelayer\"", 5, "black"),
+		/obj/item/supply_beacon = list(CAT_ENGSUP, "Supply beacon", 5, "black"),
 		/obj/item/minerupgrade/overclock = list(CAT_ENGSUP, "Mining well overclock upgrade", 4, "black"),
 		/obj/item/minerupgrade/reinforcement = list(CAT_ENGSUP, "Mining well reinforcement upgrade", 4, "black"),
 		/obj/item/minerupgrade/automatic = list(CAT_ENGSUP, "Mining well automation upgrade", 4, "black"),