Merge branch 'talos' of https://github.com/Helg2/RuTGMC-Reborn into t…

…alos
PMC-Unga-Marines · Jul 29, 2024 · 4ab5a7a · 4ab5a7a
2 parents 8bb8e19 + 82ec4ff
commit 4ab5a7a
Show file tree

Hide file tree

Showing 633 changed files with 9,722 additions and 15,078 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,7 +8,7 @@
 
 ## `Ченджлог`
 
-<!-- Данная форма позволяет игрокам наблюдать историю изменений прямо в игре и должна содержать тезисную информацию о том, как этот ПР полияет на игрока, нежели его общее содержание. -->
+<!-- Данная форма позволяет игрокам наблюдать историю изменений прямо в игре и должна содержать тезисную информацию о том, как этот ПР повлияет на игрока, нежели его общее содержание. -->
 
 <!-- Не удалять апострофы -->
 ```

diff --git a/_maps/map_files/BigRed_v2/BigRed_v2.dmm b/_maps/map_files/BigRed_v2/BigRed_v2.dmm
@@ -11576,7 +11576,7 @@
 /turf/open/floor/freezer,
 /area/bigredv2/caves/lambda_lab)
 "kuf" = (
-/obj/mecha_wreckage/ripley,
+/obj/structure/mecha_wreckage/ripley,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor,
 /area/bigredv2/outside/cargo)
@@ -14405,7 +14405,7 @@
 /turf/open/floor,
 /area/bigredv2/outside/engineering)
 "rlw" = (
-/obj/mecha_wreckage/seraph,
+/obj/structure/mecha_wreckage/seraph,
 /turf/open/floor/tile/dark,
 /area/bigredv2/outside/nanotrasen_lab/inside/garbledradio)
 "rlA" = (

diff --git a/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm b/_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm
@@ -8809,7 +8809,7 @@
 /turf/open/floor/plating/ground/concrete,
 /area/campaign/jungle_outpost/outpost/req/depot)
 "Mc" = (
-/obj/mecha_wreckage/durand,
+/obj/structure/mecha_wreckage/durand,
 /turf/open/floor/tile/purple/whitepurple{
 	dir = 1
 	},

diff --git a/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/_maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm
@@ -32238,7 +32238,7 @@
 	},
 /area/ice_colony/underground/medical/lobby/garbledradio)
 "woG" = (
-/obj/mecha_wreckage/ripley,
+/obj/structure/mecha_wreckage/ripley,
 /turf/open/floor/plating/ground/snow/layer0,
 /area/ice_colony/exterior/surface/valley/south)
 "woW" = (

diff --git a/_maps/map_files/LV624/LV624.dmm b/_maps/map_files/LV624/LV624.dmm
@@ -4984,7 +4984,6 @@
 	},
 /obj/structure/showcase,
 /obj/effect/turf_decal/sandytile,
-/obj/structure/spider/stickyweb,
 /turf/open/floor/tile/whiteyellow/full,
 /area/lv624/lazarus/sandtemple/garbledradio)
 "dRM" = (
@@ -7084,7 +7083,7 @@
 /area/lv624/ground/caves/central4/garbledradio)
 "gmL" = (
 /obj/structure/table/mainship,
-/obj/item/restraints/handcuffs/cyborg,
+/obj/item/restraints/handcuffs,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
@@ -8878,7 +8877,7 @@
 	},
 /area/lv624/lazarus/hydroponics/aux)
 "iud" = (
-/obj/mecha_wreckage/ripley/lv624,
+/obj/structure/mecha_wreckage/ripley/lv624,
 /turf/open/floor/plating/ground/dirt,
 /area/lv624/ground/sand4)
 "iuM" = (

diff --git a/_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm b/_maps/map_files/Lawanka_Outpost/LawankaOutpost.dmm
@@ -14953,7 +14953,7 @@
 	},
 /area/shuttle/drop1/lz1)
 "mMn" = (
-/obj/mecha_wreckage/ripley,
+/obj/structure/mecha_wreckage/ripley,
 /turf/open/floor/mech_bay_recharge_floor,
 /area/lawankaoutpost/colony/cargo)
 "mMH" = (
@@ -25824,7 +25824,7 @@
 /turf/open/floor/tile/red/whitered,
 /area/lawankaoutpost/colony/medbay)
 "vJJ" = (
-/obj/mecha_wreckage/ripley,
+/obj/structure/mecha_wreckage/ripley,
 /turf/open/floor/mech_bay_recharge_floor,
 /area/lawankaoutpost/colony/mining)
 "vJM" = (
@@ -26621,7 +26621,7 @@
 	},
 /area/shuttle/drop1/lz1)
 "wns" = (
-/obj/mecha_wreckage/phazon,
+/obj/structure/mecha_wreckage/phazon,
 /turf/open/floor/mech_bay_recharge_floor,
 /area/lawankaoutpost/colony/robotics)
 "wnM" = (
@@ -28029,7 +28029,7 @@
 /turf/open/ground/grass/weedable,
 /area/lawankaoutpost/outside/south)
 "xxH" = (
-/obj/mecha_wreckage/seraph,
+/obj/structure/mecha_wreckage/seraph,
 /turf/open/floor/tile/dark/yellow2{
 	dir = 1
 	},

diff --git a/_maps/map_files/slumbridge/slumbridge.dmm b/_maps/map_files/slumbridge/slumbridge.dmm
@@ -638,7 +638,7 @@
 	},
 /area/slumbridge/inside/sombase/west)
 "aCj" = (
-/obj/mecha_wreckage/ripley/firefighter,
+/obj/structure/mecha_wreckage/ripley/firefighter,
 /turf/open/floor/plating/ground/concrete,
 /area/slumbridge/outside/southwest)
 "aCG" = (
@@ -3645,7 +3645,7 @@
 /turf/open/floor/plating,
 /area/slumbridge/inside/colony/pharmacy)
 "cIm" = (
-/obj/mecha_wreckage/ripley/lv624,
+/obj/structure/mecha_wreckage/ripley/lv624,
 /turf/open/floor/plating/ground/concrete/edge,
 /area/slumbridge/outside/southwest)
 "cIK" = (
@@ -5080,7 +5080,7 @@
 /turf/open/ground/grass/weedable,
 /area/slumbridge/outside/southeast)
 "dQp" = (
-/obj/mecha_wreckage/ripley/lv624,
+/obj/structure/mecha_wreckage/ripley/lv624,
 /turf/open/floor/plating/ground/concrete,
 /area/slumbridge/outside/southwest)
 "dQz" = (
@@ -5358,7 +5358,7 @@
 /turf/open/floor/tile/green,
 /area/slumbridge/inside/houses/recreational)
 "dYX" = (
-/obj/mecha_wreckage/seraph,
+/obj/structure/mecha_wreckage/seraph,
 /turf/open/floor/plating/platebotc,
 /area/slumbridge/inside/engi/south)
 "dZj" = (
@@ -5623,7 +5623,7 @@
 /turf/open/floor/plating/ground/mars/random/cave,
 /area/slumbridge/caves/mining)
 "emS" = (
-/obj/mecha_wreckage/durand,
+/obj/structure/mecha_wreckage/durand,
 /turf/open/floor/plating/platebotc,
 /area/slumbridge/inside/engi/south)
 "enk" = (
@@ -6400,7 +6400,7 @@
 	},
 /area/slumbridge/inside/zeta/south)
 "eVa" = (
-/obj/mecha_wreckage/mauler,
+/obj/structure/mecha_wreckage/mauler,
 /turf/open/floor/plating/platebotc,
 /area/slumbridge/inside/engi/south)
 "eVd" = (
@@ -21882,7 +21882,7 @@
 	},
 /area/slumbridge/inside/prison/outerringsouth)
 "qkn" = (
-/obj/mecha_wreckage/ripley/lv624,
+/obj/structure/mecha_wreckage/ripley/lv624,
 /turf/open/floor/plating/ground/concrete/edge{
 	dir = 4
 	},
@@ -26508,7 +26508,7 @@
 /turf/open/floor/plating,
 /area/slumbridge/inside/pmcdome)
 "tBA" = (
-/obj/mecha_wreckage/gygax,
+/obj/structure/mecha_wreckage/gygax,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/platebotc,
 /area/slumbridge/inside/engi/south)
@@ -31334,7 +31334,7 @@
 /turf/open/floor/tile/showroom,
 /area/slumbridge/inside/engi/west)
 "xbI" = (
-/obj/mecha_wreckage/marauder,
+/obj/structure/mecha_wreckage/marauder,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/platebotc,
 /area/slumbridge/inside/engi/south)
@@ -32293,7 +32293,7 @@
 /turf/open/floor/plating,
 /area/slumbridge/inside/colony/kitchen)
 "xQE" = (
-/obj/mecha_wreckage/ripley,
+/obj/structure/mecha_wreckage/ripley,
 /turf/open/floor/tile/dark,
 /area/slumbridge/inside/colony/construction)
 "xQF" = (

diff --git a/_maps/modularmaps/big_red/bigredofficevar1.dmm b/_maps/modularmaps/big_red/bigredofficevar1.dmm
@@ -495,7 +495,7 @@
 /turf/open/floor,
 /area/bigredv2/outside/office_complex)
 "vR" = (
-/obj/mecha_wreckage/ripley/firefighter,
+/obj/structure/mecha_wreckage/ripley/firefighter,
 /turf/open/floor/mech_bay_recharge_floor,
 /area/bigredv2/outside/office_complex)
 "vU" = (

diff --git a/_maps/modularmaps/big_red/bigredsecornervar6.dmm b/_maps/modularmaps/big_red/bigredsecornervar6.dmm
@@ -388,7 +388,7 @@
 /area/bigredv2/caves/secomplex)
 "wO" = (
 /obj/effect/decal/cleanable/cobweb,
-/obj/mecha_wreckage/ripley/lv624,
+/obj/structure/mecha_wreckage/ripley/lv624,
 /turf/open/floor/tile/dark,
 /area/bigredv2/caves/secomplex)
 "xa" = (

diff --git a/_maps/modularmaps/lv624/newcavevar2.dmm b/_maps/modularmaps/lv624/newcavevar2.dmm
@@ -18,7 +18,7 @@
 /area/lv624/ground/caves/central2)
 "cu" = (
 /obj/item/mecha_parts/part/durand_head,
-/obj/mecha_wreckage/durand,
+/obj/structure/mecha_wreckage/durand,
 /turf/open/floor/plating/ground/dirt,
 /area/lv624/ground/caves/central2)
 "cQ" = (

diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
@@ -39,7 +39,6 @@
 
 #define INVISIBILITY_ABSTRACT 101 //only used for abstract objects (e.g. spacevine_controller), things that are not really there.
 
-
 //Object specific defines
 #define CANDLE_LUM 3 //For how bright candles are
 
@@ -48,24 +47,11 @@
 #define SEC_LEVEL_RED 2
 #define SEC_LEVEL_DELTA 3
 
-
-//=================================================
-#define HOSTILE_STANCE_IDLE 1
-#define HOSTILE_STANCE_ALERT 2
-#define HOSTILE_STANCE_ATTACK 3
-#define HOSTILE_STANCE_ATTACKING 4
-#define HOSTILE_STANCE_TIRED 5
-//=================================================
-
-
 //=================================================
 //Game mode related defines.
 
 #define TRANSITIONEDGE 3 //Distance from edge to move to another z-level
 
-//Flags for zone sleeping
-#define ZONE_ACTIVE 1
-#define ZONE_SLEEPING 0
 #define GET_RANDOM_FREQ rand(32000, 55000) //Frequency stuff only works with 45kbps oggs.
 
 //ceiling types
@@ -78,7 +64,6 @@
 #define CEILING_DEEP_UNDERGROUND 6
 #define CEILING_DEEP_UNDERGROUND_METAL 6
 
-
 // Default font settings
 #define FONT_SIZE "5pt"
 #define FONT_COLOR "#09f"
@@ -90,21 +75,13 @@
 
 #define GAME_YEAR (text2num(time2text(world.realtime, "YYYY")) + 395)
 
-
 #define MAX_MESSAGE_LEN 1024
 #define MAX_PAPER_MESSAGE_LEN 3072
 #define MAX_BOOK_MESSAGE_LEN 9216
 #define MAX_NAME_LEN 26
 #define MAX_BROADCAST_LEN 512
 #define MAX_NAME_HYPO 3
 
-
-//for whether AI eyes see static, and whether it is mouse-opaque or not
-#define USE_STATIC_NONE 0
-#define USE_STATIC_TRANSPARENT 1
-#define USE_STATIC_OPAQUE 2
-
-
 #define CINEMATIC_DEFAULT 1
 #define CINEMATIC_SELFDESTRUCT 2
 #define CINEMATIC_SELFDESTRUCT_MISS 3

diff --git a/code/__DEFINES/_radio.dm b/code/__DEFINES/_radio.dm
@@ -60,13 +60,13 @@
 #define RADIO_CHANNEL_ECHO "Echo"
 #define RADIO_CHANNEL_DS1 "Alamo"
 #define RADIO_CHANNEL_DS2 "Normandy"
-#define RADIO_CHANNEL_YAUTJA "Yautja" //RU TGMC ADDITION
+#define RADIO_CHANNEL_YAUTJA "Yautja"
 
 #define MIN_FREE_FREQ 1201 // -------------------------------------------------
 // Frequencies are always odd numbers and range from 1201 to 1599.
 
 //Preds
-#define YAUT_FREQ 1233 //RU TGMC ADDITION
+#define YAUT_FREQ 1233
 
 //SOM squads
 #define FREQ_COMMAND_SOM 1235
@@ -119,14 +119,11 @@
 
 #define FREQ_CIV_GENERAL 1469
 
-
 #define MAX_FREQ 1489 // ------------------------------------------------------
 
-
 #define MAX_FREE_FREQ 1599 // -------------------------------------------------
 
 
-
 // Transmission types.
 #define TRANSMISSION_WIRE 0  // some sort of wired connection, not used
 #define TRANSMISSION_RADIO 1  // electromagnetic radiation (default)

diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm
@@ -18,6 +18,7 @@ GLOBAL_LIST_EMPTY(all_req_one_access)
 #define ACCESS_MARINE_RESEARCH 13
 #define ACCESS_MARINE_SMARTPREP 14
 #define ACCESS_MARINE_COMMANDER 15
+#define ACCESS_MARINE_ROBO 16
 
 #define ACCESS_MARINE_BRIDGE 40
 #define ACCESS_MARINE_CHEMISTRY 41

diff --git a/code/__DEFINES/actions.dm b/code/__DEFINES/actions.dm
@@ -13,15 +13,12 @@
 #define ABILITY_IGNORE_DEAD_TARGET (1 << 13) // bypass checks of a dead target
 #define ABILITY_IGNORE_SELECTED_ABILITY (1 << 14) // bypass the check of the selected ability
 #define ABILITY_DO_AFTER_ATTACK (1 << 15) //Let the xeno attack the object and perform the ability.
-#define ABILITY_USE_BURROWED (1 << 16) // ignore being burrowed
-#define ABILITY_USE_ROOTED (1 << 17) // ignore being currently rooted
 
 #define ABILITY_TURF_TARGET (1 << 0) // ability targets turfs
 #define ABILITY_MOB_TARGET (1 << 1) // ability targets mobs
 
 #define ABILITY_KEYBIND_USE_ABILITY (1 << 0) // immediately activate even if selectable
 
-
 #define ABILITY_CRASH (1<<0)
 #define ABILITY_NUCLEARWAR (1<<1)
 #define ABILITY_ALL_GAMEMODE (ABILITY_CRASH|ABILITY_NUCLEARWAR)
diff --git a/code/__DEFINES/area.dm b/code/__DEFINES/area.dm
@@ -14,7 +14,7 @@
 #define NO_DROPPOD (1<<2)
 ///Make this area immune to cas/ob laser. Explosions can still go through if the ob is called in a nearby area
 #define OB_CAS_IMMUNE (1<<3)
-///Prevent wraith from portaling there, and hivemind to weed there when shutters are closed
+///Prevent hivemind to weed there when shutters are closed
 #define MARINE_BASE (1<<4)
 ///radio works even underground
 #define ALWAYS_RADIO (1<<5)
diff --git a/code/__DEFINES/conflict.dm b/code/__DEFINES/conflict.dm
@@ -208,19 +208,6 @@
 
 #define MAX_PARALYSE_AMOUNT_FOR_PARALYSE_RESISTANT 2 SECONDS
 
-//Xeno Overlays Indexes//////////
-#define X_PRED_LASER_LAYER 10
-#define X_LASER_LAYER 9
-#define X_WOUND_LAYER 8
-#define X_HEAD_LAYER 7
-#define X_SUIT_LAYER 6
-#define X_L_HAND_LAYER 5
-#define X_R_HAND_LAYER 4
-#define X_TARGETED_LAYER 3
-#define X_FIRE_LAYER 1
-#define X_TOTAL_LAYERS 10
-/////////////////////////////////
-
 // No neighbors
 #define NEIGHBORS_NONE  0
 // Cardinal neighborhood

diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm
@@ -45,7 +45,6 @@
 #define COOLDOWN_GAS_BREATH "cooldown_gas_breath"
 #define COOLDOWN_SIGNALLER_SEND "cooldown_signaller_send"
 #define COOLDOWN_BIKE_FUEL_MESSAGE "cooldown_bikee_fuel_message"
-#define COOLDOWN_WRAITH_PORTAL_TELEPORTED "cooldown_wraith_portal_teleported"
 #define COOLDOWN_ITEM_TRICK "cooldown_item_trick"
 #define COOLDOWN_RAVAGER_FLAMER_ACT "cooldown_ravager_flamer_act"
 #define COOLDOWN_DROPPOD_TARGETTING "cooldown_droppod_targetting"
@@ -94,11 +93,6 @@
  * Cooldown system based on an datum-level associative lazylist using timers.
 */
 
-//INDEXES
-#define COOLDOWN_BORG_SELF_REPAIR "borg_self_repair"
-#define COOLDOWN_EXPRESSPOD_CONSOLE "expresspod_console"
-
-
 //TIMER COOLDOWN MACROS
 
 #define COMSIG_CD_STOP(cd_index) "cooldown_[cd_index]"