Merge remote-tracking branch 'upstream/master'

_maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm

@@ -10287,7 +10287,7 @@
 "hwn" = (
 /obj/structure/table/mainship,
 /obj/item/tool/surgery/hemostat,
-/obj/item/folder/black_random,
+/obj/effect/spawner/random/misc/folder,
 /turf/open/floor/mainship/mono,
 /area/magmoor/research/rnd/lobby)
 "hwY" = (
@@ -10340,7 +10340,7 @@
 /area/magmoor/command/lobby)
 "hyr" = (
 /obj/structure/table/mainship,
-/obj/item/folder/black_random,
+/obj/effect/spawner/random/misc/folder,
 /obj/item/tool/pen,
 /obj/machinery/air_alarm,
 /turf/open/floor/mainship/purple{

_maps/map_files/Talos/TGS_Talos.dmm

@@ -5449,7 +5449,7 @@
 	},
 /area/mainship/hull/starboard_hull)
 "ddo" = (
-/obj/item/folder/black_random,
+/obj/effect/spawner/random/misc/folder,
 /obj/structure/table/reinforced,
 /obj/machinery/door/window/secure/bridge,
 /obj/machinery/door/window{
@@ -14071,8 +14071,7 @@
 "iDP" = (
 /obj/machinery/door_control/mainship/cic{
 	id = "bot_armory";
-	name = "Armory Lockdown";
-	pixel_x = -5
+	name = "Armory Lockdown"
 	},
 /turf/open/floor/mainship/metal/full,
 /area/mainship/command/cic)
@@ -16856,7 +16855,7 @@
 	id = "CIC Lockdown";
 	name = "\improper Combat Information Center Blast Door"
 	},
-/obj/item/folder/black_random,
+/obj/effect/spawner/random/misc/folder,
 /obj/machinery/door/poddoor/shutters/mainship/open{
 	id = "CIC Checkpoint Shutters";
 	name = "\improper CIC Checkpoint Shutters"
@@ -20988,9 +20987,7 @@
 "myC" = (
 /obj/effect/turf_decal/woodsiding,
 /obj/structure/table/woodentable,
-/obj/item/folder/black_random{
-	pixel_y = 2
-	},
+/obj/effect/spawner/random/misc/folder,
 /obj/item/eftpos{
 	eftpos_name = "Cargo Bay EFTPOS scanner";
 	pixel_y = 1;
@@ -23648,7 +23645,7 @@
 /area/mainship/hallways/bow_hallway)
 "nUD" = (
 /obj/structure/table/mainship,
-/obj/item/folder/black_random,
+/obj/effect/spawner/random/misc/folder,
 /obj/machinery/camera/autoname{
 	dir = 1
 	},
@@ -28368,14 +28365,16 @@
 	},
 /obj/machinery/door_control/mainship/cic{
 	dir = 1;
-	pixel_x = 5
+	pixel_x = 5;
+	pixel_y = -16
 	},
 /obj/effect/turf_decal/siding/metal,
 /obj/machinery/door_control{
 	id = "Brig Lockdown";
 	name = "Brig Lockdown";
 	dir = 1;
-	pixel_x = -6
+	pixel_x = -6;
+	pixel_y = -16
 	},
 /turf/open/floor/mainship/metal,
 /area/mainship/command/cic)

_maps/map_files/generic/Admin_Level.dmm

@@ -1126,9 +1126,7 @@
 /turf/open/floor/plating/ground/mars/random/cave,
 /area/centcom/valhalla/xenocave)
 "prY" = (
-/obj/machinery/button/valhalla/xeno_button{
-	link = "marinesurgery"
-	},
+/obj/machinery/practice/medical/surgery,
 /turf/open/floor/mainship/metal/gray,
 /area/centcom/valhalla)
 "pwk" = (
@@ -1388,9 +1386,6 @@
 /turf/open/floor/tile/red/yellowfull,
 /area/tdome/tdomeadmin)
 "tiQ" = (
-/obj/effect/landmark/valhalla/marine_spawner_landmark{
-	where = "surgery"
-	},
 /obj/item/tank/anesthetic,
 /obj/item/clothing/mask/breath/medical,
 /obj/machinery/optable/valhalla,

_maps/predator/huntership.dmm

@@ -492,7 +492,7 @@
 /area/yautja)
 "by" = (
 /obj/effect/decal/remains/human,
-/obj/alien/egg/hugger/forsaken,
+/obj/alien/egg/hugger/yautja,
 /turf/open/floor/strata/multi_tiles,
 /area/yautja)
 "bz" = (
@@ -1784,7 +1784,7 @@
 /turf/open/floor/corsat,
 /area/yautja)
 "ua" = (
-/obj/alien/egg/hugger/forsaken,
+/obj/alien/egg/hugger/yautja,
 /turf/open/floor/strata/multi_tiles,
 /area/yautja)
 "uO" = (

code/__DEFINES/colors.dm

@@ -224,6 +224,8 @@ Important note: colors can end up significantly different from the basic html pi
 #define LIGHT_COLOR_LIGHT_CYAN "#40CEFF"
 /// Saturated blue. rgb(51, 117, 248)
 #define LIGHT_COLOR_DARK_BLUE "#6496FA"
+/// Blue used by keycard auth when blinking rgb(086, 104, 225)
+#define LIGHT_COLOR_KEYCARD_BLUE "#5668E1"
 /// Diluted, mid-warmth pink. rgb(225, 125, 225)
 #define LIGHT_COLOR_PINK "#E17DE1"
 /// Dimmed yellow, leaning kaki. rgb(225, 225, 125)

code/__DEFINES/dcs/signals.dm

@@ -305,6 +305,8 @@
 #define COMSIG_OBJ_HIDE "obj_hide"
 #define COMSIG_OBJ_ATTACK_ALIEN "obj_attack_alien"				//from obj/attack_alien(): (/mob/living/carbon/xenomorph)
 	#define COMPONENT_NO_ATTACK_ALIEN (1<<0)
+/// from /obj/obj_reskin: (mob/user, skin)
+#define COMSIG_OBJ_RESKIN "obj_reskin"
 
 #define COMSIG_MACHINERY_POWERED "machinery_powered"			/// from /obj/machinery/proc/powered: ()
 	#define COMPONENT_POWERED (1<<0)

code/__DEFINES/factions.dm

@@ -12,12 +12,10 @@
 #define FACTION_SOM "Sons of Mars"
 #define FACTION_ICC "Independent Colonial Confederation"
 #define FACTION_USL "United Space Lepidoptera"
-#define FACTION_ALIEN "Alien"
-#define FACTION_SPIDER "Spider"
-#define FACTION_HIVEBOT "Hivebot"
 #define FACTION_HOSTILE "Hostile"
 #define FACTION_PIRATE "Pirate"
 #define FACTION_SPECFORCE "Special Forces"
+#define FACTION_YAUTJA "Yautja"
 
 //Alignement are currently only used by req.
 ///Mob with a neutral alignement cannot be sold by anyone
@@ -45,11 +43,9 @@ GLOBAL_LIST_INIT(faction_to_alignement, list(
 	FACTION_SOM = ALIGNEMENT_HOSTILE,
 	FACTION_ICC = ALIGNEMENT_HOSTILE,
 	FACTION_USL = ALIGNEMENT_HOSTILE,
-	FACTION_ALIEN = ALIGNEMENT_HOSTILE,
-	FACTION_SPIDER = ALIGNEMENT_HOSTILE,
-	FACTION_HIVEBOT = ALIGNEMENT_HOSTILE,
 	FACTION_HOSTILE = ALIGNEMENT_HOSTILE,
 	FACTION_PIRATE = ALIGNEMENT_HOSTILE,
+	FACTION_YAUTJA = ALIGNEMENT_HOSTILE,
 ))
 
 ///Iff signals for factions
@@ -63,6 +59,7 @@ GLOBAL_LIST_INIT(faction_to_alignement, list(
 #define SECTOIDS_IFF (1<<7)
 #define USL_IFF (1<<8)
 #define PIRATE_IFF (1<<9)
+#define YAUTJA_IFF (1<<10)
 
 ///Iff for each faction that is able to use iff
 GLOBAL_LIST_INIT(faction_to_iff, list(
@@ -80,6 +77,7 @@ GLOBAL_LIST_INIT(faction_to_iff, list(
 	FACTION_ICC = ICC_IFF,
 	FACTION_USL = USL_IFF,
 	FACTION_PIRATE = PIRATE_IFF,
+	FACTION_YAUTJA = YAUTJA_IFF,
 ))
 
 ///Acronyms for each faction, or the shortest name possible
@@ -98,6 +96,7 @@ GLOBAL_LIST_INIT(faction_to_acronym, list(
 	FACTION_ICC = "ICC",
 	FACTION_USL = "USL",
 	FACTION_PIRATE = "Pirates",
+	FACTION_YAUTJA = "Yautjas",
 ))
 
 ///List of correspond factions to data hud

code/__DEFINES/is_helpers.dm

@@ -286,6 +286,7 @@
 #define isexterminationgamemode(O) (istype(O, /datum/game_mode/infestation/distress/extermination))
 #define isdistressgamemode(O) (istype(O, /datum/game_mode/infestation/distress))
 #define ispointsdefencegamemode(O) (istype(O, /datum/game_mode/infestation/distress/points_defence))
+#define islaststandgamemode(O) istype(O, /datum/game_mode/last_stand)
 
 #define isxenoresearcharea(A) (istype(A, /area/mainship/medical/medical_science))
 
@@ -301,7 +302,7 @@
 
 // Xeno hives
 #define isnormalhive(hive) (istype(hive, /datum/hive_status/normal))
-#define isxenohive(A) ((A == XENO_HIVE_NONE) || (A == XENO_HIVE_NORMAL) || (A == XENO_HIVE_CORRUPTED) || (A == XENO_HIVE_ALPHA) || (A == XENO_HIVE_BETA) || (A == XENO_HIVE_ZETA) || (A == XENO_HIVE_ADMEME)) || (A == XENO_HIVE_FALLEN) || (A == XENO_HIVE_FORSAKEN) || (A == XENO_HIVE_YAUTJA)
+#define isxenohive(A) ((A == XENO_HIVE_NONE) || (A == XENO_HIVE_NORMAL) || (A == XENO_HIVE_CORRUPTED) || (A == XENO_HIVE_ALPHA) || (A == XENO_HIVE_BETA) || (A == XENO_HIVE_ZETA) || (A == XENO_HIVE_ADMEME)) || (A == XENO_HIVE_FALLEN) || (A == XENO_HIVE_YAUTJA)
 // Slot helpers
 #define ishandslot(A) ((A == SLOT_L_HAND) || (A == SLOT_R_HAND))
 

code/__DEFINES/jobs.dm

@@ -134,7 +134,7 @@ GLOBAL_LIST_INIT(jobs_fallen_marine, typecacheof(list(/datum/job/fallen/marine),
 #define XP_REQ_EXPERT 3600
 
 // how much a job is going to contribute towards burrowed larva. see config for points required to larva. old balance was 1 larva per 3 humans.
-#define LARVA_POINTS_SHIPSIDE 1
+#define LARVA_POINTS_SHIPSIDE 0.5
 #define LARVA_POINTS_SHIPSIDE_STRONG 1.5
 #define LARVA_POINTS_REGULAR 3.25
 #define LARVA_POINTS_STRONG 6

code/__DEFINES/loadout.dm

@@ -75,6 +75,8 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list(
 	/obj/item/reagent_containers/hypospray/autoinjector/synaptizine	 = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"),
 	/obj/vehicle/ridden/motorbike = list(CAT_MARINE, "Bike", 30, "blue"),
 	/obj/item/sidecar = list(CAT_MARINE, "Bike sidecar", 8, "blue"),
+	/obj/item/ammo_magazine/rifle/ar21/extended = list(CAT_MARINE, "AR-21 extended magazine", 14, "blue"),
+	/obj/item/storage/briefcase/standard_magnum = list(CAT_MARINE, "R-76 crate", 22, "blue"),
 ))
 
 GLOBAL_LIST_INIT(robot_gear_listed_products, list(
@@ -207,6 +209,8 @@ GLOBAL_LIST_INIT(leader_gear_listed_products, list(
 	/obj/item/storage/holster/belt/revolver/mateba/full = list(CAT_LEDSUP, "Mateba Autorevolver belt", 10, "red"),
 	/obj/item/ammo_magazine/revolver/mateba = list(CAT_LEDSUP, "Mateba magazine", 2, "orange2"),
 	/obj/item/ammo_magazine/packet/mateba = list(CAT_LEDSUP, "Mateba packet", 3, "orange2"),
+	/obj/item/ammo_magazine/rifle/ar21/extended = list(CAT_LEDSUP, "AR-21 extended magazine", 3, "orange2"),
+	/obj/item/storage/briefcase/standard_magnum = list(CAT_LEDSUP, "R-76 crate", 10, "orange2"),
 	/obj/item/storage/holster/backholster/rpg/full = list(CAT_LEDSUP, "RL-160 Recoilless rifle kit", 15, "red"),
 	/obj/item/ammo_magazine/rocket/recoilless = list(CAT_LEDSUP, "RL-160 RR HE shell", 2, "orange2"),
 	/obj/item/ammo_magazine/rocket/recoilless/light = list(CAT_LEDSUP, "RL-160 RR LE shell", 2, "orange2"),
@@ -219,7 +223,6 @@ GLOBAL_LIST_INIT(leader_gear_listed_products, list(
 	/obj/item/ammo_magazine/shotgun/mbx900/buckshot = list(CAT_LEDSUP, "A box of .410 buckshot rounds", 1, "orange2"),
 	/obj/item/weapon/gun/rifle/tx55 = list(CAT_LEDSUP, "AR-55 OICW Rifle", 15, "red"),
 	/obj/item/ammo_magazine/rifle/tx54 = list(CAT_LEDSUP, "GL-54 Flak Magazine for AR-55/GL-54", 2, "orange2"),
-	/obj/item/ammo_magazine/rifle/tx54/he = list(CAT_LEDSUP, "GL-54 HE Magazine for AR-55/GL-54", 3, "orange2"),
 	/obj/item/ammo_magazine/rifle/tx54/smoke = list(CAT_LEDSUP, "GL-54 tactical smoke Magazine for AR-55/GL-54", 1, "orange2"),
 	/obj/item/ammo_magazine/rifle/tx54/smoke/tangle = list(CAT_LEDSUP, "GL-54 Tanglefoot Magazine for AR-55/GL-54", 3, "orange2"),
 	/obj/item/cell/lasgun/lasrifle/recharger = list(CAT_LEDSUP, "Terra Experimental recharger battery", 4, "orange2"),
@@ -270,6 +273,8 @@ GLOBAL_LIST_INIT(commander_gear_listed_products, list(
 	/obj/item/ammo_magazine/flamer_tank/large = list(CAT_FCSUP, "FL-84 normal fuel tank", 5, "orange2"),
 	/obj/item/ammo_magazine/flamer_tank/large/X = list(CAT_FCSUP, "FL-84 X-fuel tank", 15, "orange2"),
 	/obj/item/weapon/gun/energy/lasgun/lasrifle/xray = list(CAT_FCSUP, "TE-X Laser Rifle", 23, "red"),
+	/obj/item/ammo_magazine/rifle/ar21/extended = list(CAT_FCSUP, "AR-21 extended magazine", 3, "red"),
+	/obj/item/storage/briefcase/standard_magnum = list(CAT_FCSUP, "R-76 crate", 10, "red"),
 	/obj/item/weapon/gun/rifle/railgun = list(CAT_FCSUP, "SR-220 Railgun", 23, "red"),
 	/obj/item/ammo_magazine/railgun = list(CAT_FCSUP, "SR-220 Railgun APDS round", 2, "orange2"),
 	/obj/item/ammo_magazine/railgun/hvap = list(CAT_FCSUP, "SR-220 Railgun HVAP round", 3, "orange2"),

code/__DEFINES/mobs.dm

@@ -159,6 +159,7 @@
 #define XENO_HIVE_ZETA "zeta_hive"
 #define XENO_HIVE_ADMEME "admeme_hive"
 #define XENO_HIVE_FALLEN "fallen_hive"
+#define XENO_HIVE_YAUTJA "yautja_hive"
 
 // =============================
 // xeno tiers

code/__DEFINES/objects.dm

@@ -240,6 +240,13 @@ GLOBAL_LIST_INIT(restricted_camera_networks, list( //Those networks can only be
 #define DROPPOD_ACTIVE 2
 #define DROPPOD_LANDED 3
 
+#define DROPSHIP_WEAPON "dropship_weapon"
+#define DROPSHIP_WEAPON_CAS "dropship_weapon_cas"
+#define DROPSHIP_CREW_WEAPON "dropship_crew_weapon"
+#define DROPSHIP_ELECTRONICS "dropship_electronics"
+#define DROPSHIP_FUEL_EQP "dropship_fuel_equipment"
+#define DROPSHIP_COMPUTER "dropship_computer"
+
 ///Burn level applied by lava if it calls fire_act
 #define LAVA_BURN_LEVEL 60
 

code/__DEFINES/predators.dm

@@ -25,10 +25,6 @@
 #define ACCESSORY_SLOT_ARMOR_Y_RH "right_hand_bones"
 #define ACCESSORY_SLOT_ARMOR_Y_LH "left_hand_bones"
 
-#define FACTION_YAUTJA "Yautja"
-#define XENO_HIVE_FORSAKEN "forsaken_hive"
-#define XENO_HIVE_YAUTJA "yautja_hive"
-
 #define JOB_PREDATOR "Predator"
 
 #define CATEGORY_YAUTJA "YAUTJA"

code/__DEFINES/speech_channels.dm

@@ -8,3 +8,4 @@
 #define XOOC_CHANNEL "XOOC"
 #define ADMIN_CHANNEL "Admin"
 #define MENTOR_CHANNEL "Mentor"
+#define DEAD_CHANNEL "Dead"

code/__DEFINES/xeno.dm

@@ -45,7 +45,11 @@
 #define PANTHER_OZELOMELYN "Ozelomelyn"
 #define PANTHER_SANGUINAL "Sanguinal"
 
-#define TRAP_HUGGER "hugger"
+#define TRAP_HUGGER_LARVAL "hugger larval"
+#define TRAP_HUGGER_ACID "hugger acid"
+#define TRAP_HUGGER_NEURO "hugger neuro"
+#define TRAP_HUGGER_RESIN "hugger resin"
+#define TRAP_HUGGER_SLASH "hugger slash"
 #define TRAP_SMOKE_NEURO "neurotoxin gas"
 #define TRAP_SMOKE_ACID "acid gas"
 #define TRAP_ACID_WEAK "weak acid"
@@ -91,18 +95,16 @@ GLOBAL_LIST_INIT(defiler_toxin_type_list, list(
 		/datum/reagent/toxin/xeno_ozelomelyn,
 		/datum/reagent/toxin/xeno_hemodile,
 		/datum/reagent/toxin/xeno_transvitox,
-//		/datum/reagent/toxin/xeno_neurotoxin, RU TGMC EDIT DELETION
-		/datum/reagent/toxin/acid, //RUTGMC EDIT ADDITION
+		/datum/reagent/toxin/acid,
 		))
 
 //List of toxins improving defile's damage
 GLOBAL_LIST_INIT(defiler_toxins_typecache_list, typecacheof(list(
 		/datum/reagent/toxin/xeno_ozelomelyn,
 		/datum/reagent/toxin/xeno_hemodile,
 		/datum/reagent/toxin/xeno_transvitox,
-//		/datum/reagent/toxin/xeno_neurotoxin, RU TGMC EDIT DELETION
 		/datum/reagent/toxin/xeno_sanguinal,
-		/datum/reagent/toxin/acid, //RUTGMC EDIT ADDITION
+		/datum/reagent/toxin/acid,
 		/datum/status_effect/stacking/intoxicated,
 		)))
 

code/__HELPERS/unsorted.dm

@@ -1108,9 +1108,9 @@ will handle it, but:
 	animate(I, transform = 0, alpha = 255, time = 0.5 SECONDS, easing = ELASTIC_EASING)
 	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(fade_out), I), duration - 0.5 SECONDS)
 
-/proc/fade_out(image/I, list/show_to)
-	animate(I, alpha = 0, time = 0.5 SECONDS, easing = EASE_IN)
-	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_images_from_clients), I, show_to), 0.5 SECONDS)
+/proc/fade_out(image/I, list/show_to, our_time = 0.5 SECONDS)
+	animate(I, alpha = 0, time = our_time, easing = EASE_IN)
+	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_images_from_clients), I, show_to), our_time)
 
 //takes an input_key, as text, and the list of keys already used, outputting a replacement key in the format of "[input_key] ([number_of_duplicates])" if it finds a duplicate
 //use this for lists of things that might have the same name, like mobs or objects, that you plan on giving to a player as input

code/_globalvars/lists/objects.dm

@@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(tower_relay_locs)
 GLOBAL_LIST_EMPTY(xenoden_docking_ports_locs)
 GLOBAL_LIST_EMPTY(xenoden_cores_locs)
 
-GLOBAL_VAR(waves_spawner_loc)
+GLOBAL_LIST_EMPTY(waves_spawner_locs)
 
 GLOBAL_LIST_EMPTY(last_stand_nukes)
 

code/_onclick/hud/_defines.dm

@@ -97,26 +97,3 @@
 #define ui_ai_bioscan "SOUTH:6,WEST+4"
 #define ui_ai_multicam "SOUTH:6,WEST+17"
 #define ui_ai_add_multicam "SOUTH:6,WEST+18"
-
-// Какого хрена атомы лежат в дефайнах?!
-// TODO: Уберите предовские атомы в другой И ПОДХОДЯЩИЙ файл, плиз.
-/*
-			| | |
-			| | |
-			v v v
-*/
-/atom/movable/screen/fullscreen/machine/pred
-	alpha = 140
-
-/atom/movable/screen/fullscreen/machine/pred/meson
-	icon_state = "pred_meson"
-	icon = 'icons/mob/screen/full.dmi'
-
-/atom/movable/screen/fullscreen/machine/pred/night
-	icon_state = "robothalf"
-
-/datum/hud/var/atom/movable/screen/pred_power_icon
-
-/datum/hud/Destroy()
-	pred_power_icon = null
-	return ..()