Merge pull request #5 from PMC-Unga-Marines/cleanup

AntiRebase наступил

code/__DEFINES/atom_hud.dm

@@ -26,6 +26,7 @@
 #define XENO_FIRE_HUD "xeno_fire_hud" // displays how many fire stacks a xeno has
 #define XENO_BLESSING_HUD "xeno_blessing_hud" //indicates what blessings the xeno has
 #define XENO_EVASION_HUD "xeno_extra_hud" // displays anything extra or additional such as runner's evasion duration
+#define XENO_BANISHED_HUD "xeno_banished_hud" // indicates that the xeno is banished
 
 #define ADD_HUD_TO_COOLDOWN 20 //cooldown for being shown the images for any particular data hud
 
@@ -51,6 +52,8 @@
 #define DATA_HUD_SQUAD_SOM 14
 #define DATA_HUD_XENO_DEBUFF 15
 #define DATA_HUD_XENO_HEART 16
+#define DATA_HUD_HUNTER 17
+#define DATA_HUD_HUNTER_CLAN 18
 
 
 // Notification action types
@@ -61,3 +64,11 @@
 
 // AI notify action types
 #define NOTIFY_AI_ALERT "aijump"
+
+#define HUNTER_HUD "hunter_hud" //displays various statuses on mobs for Hunters to identify targets
+#define HUNTER_CLAN "hunter_clan_hud" //displays a colored icon to represent ingame Hunter Clans
+#define HUNTER_HEALTH_HUD "hunter_health_hud" //displays a predator health
+
+
+
+#define XENO_PRIMO_HUD "xeno_primo_hud" //indicates primo upgrade hud

code/__DEFINES/calibers.dm

@@ -20,6 +20,8 @@
 #define CALIBER_454 ".454 Casull" //Mateba
 #define CALIBER_762X38 "7.62x38mm Rimmed" //UPP
 #define CALIBER_12x7 "12.7 Magnum"
+#define CALIBER_44LS ".44 Long Special"
+#define CALIBER_500 ".500 Nigro Express"
 
 // SMGs
 #define CALIBER_46X30 "4.6x30mm"

code/__DEFINES/colors.dm

@@ -1,3 +1,5 @@
+#define COLOR_RUTGMC_RED "#B43535"
+
 #define COLOR_INPUT_DISABLED "#F0F0F0"
 #define COLOR_INPUT_ENABLED "#D3B5B5"
 
@@ -108,19 +110,17 @@
 #define COLOR_ASSEMBLY_BLUE "#38559E"
 #define COLOR_ASSEMBLY_PURPLE "#6F6192"
 
-/*RUTGMC edit - pill packet color redefine
 //Color dedfines used by pill packets
-#define COLOR_PACKET_BICARIDINE "#FF0000"
-#define COLOR_PACKET_KELOTANE "#FFFF00"
+#define COLOR_PACKET_BICARIDINE "#952F48"
+#define COLOR_PACKET_KELOTANE "#BD8854"
 #define COLOR_PACKET_TRAMADOL "#675772"
 #define COLOR_PACKET_TRICORDRAZINE "#FFFFFF"
-#define COLOR_PACKET_DYLOVENE "#00FF00"
+#define COLOR_PACKET_DYLOVENE "#2DA54B"
 #define COLOR_PACKET_PARACETAMOL "#65B4B1"
 #define COLOR_PACKET_ISOTONIC "#5c0e0e"
 #define COLOR_PACKET_LEPORAZINE "#0066FF"
 #define COLOR_PACKET_RUSSIAN_RED "#3d0000"
 #define COLOR_PACKET_RYETALYN "#AC6D32"
-*/
 
 //Color defines used by medicine
 #define COLOR_REAGENT_INAPROVALINE "#9966CC" // rgb: 200, 165, 220

code/__DEFINES/combat.dm

@@ -60,10 +60,11 @@
 #define SHIELD_PURE_BLOCKING (1<<1) //Only runs a percentage chance to block, and doesn't interact in other ways.
 #define SHIELD_PARENT_INTEGRITY (1<<2) //Transfers damage to parent's integrity.
 
-/* RUTGMC REMOVAL - Explosions update
-#define EXPLODE_NONE 0
-#define EXPLODE_DEVASTATE 1
-#define EXPLODE_HEAVY 2
-#define EXPLODE_LIGHT 3
-#define EXPLODE_WEAK 4
-RU TGMC REMOVAL END */
+#define EXPLODE_DEVASTATE 300
+#define EXPLODE_HEAVY 200
+#define EXPLODE_MEDIUM 150
+#define EXPLODE_LIGHT 100
+#define EXPLODE_WEAK 50
+
+#define EMBED_LIMB_DAMAGE 5 //Damage to deal to victim's limbs.
+

code/__DEFINES/conflict.dm

@@ -209,6 +209,7 @@
 #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
@@ -217,5 +218,30 @@
 #define X_R_HAND_LAYER 4
 #define X_TARGETED_LAYER 3
 #define X_FIRE_LAYER 1
-// #define X_TOTAL_LAYERS 9 RU TGMC EDIT
+#define X_TOTAL_LAYERS 10
 /////////////////////////////////
+
+// No neighbors
+#define NEIGHBORS_NONE  0
+// Cardinal neighborhood
+#define NEIGHBORS_CARDINAL 1
+// Ordinal neighborhood
+#define NEIGHBORS_ORDINAL  2
+// Note that NEIGHBORS_CARDINAL | NEIGHBORS_ORDINALS gives you all 8 surrounding neighbors
+
+/// how much it takes to gib a mob
+#define EXPLOSION_THRESHOLD_GIB 200 // maybe should change it to 300?
+/// prone mobs receive less damage from explosions
+#define EXPLOSION_PRONE_MULTIPLIER 0.5
+
+//Explosion damage multipliers for different objects
+#define EXPLOSION_DAMAGE_MULTIPLIER_DOOR 5
+#define EXPLOSION_DAMAGE_MULTIPLIER_DOOR_OPEN 0.5
+#define EXPLOSION_DAMAGE_MULTIPLIER_WALL 7.5
+#define EXPLOSION_DAMAGE_MULTIPLIER_WINDOW 5
+
+//Explosion damage multipliers for different objects
+#define RESIN_EXPLOSIVE_MULTIPLIER 0.85
+
+//Damage modificator
+#define PRED_MELEE_DAMAGE_MOD 0.5

code/__DEFINES/cooldowns.dm

@@ -50,6 +50,8 @@
 #define COOLDOWN_RAVAGER_FLAMER_ACT "cooldown_ravager_flamer_act"
 #define COOLDOWN_DROPPOD_TARGETTING "cooldown_droppod_targetting"
 #define COOLDOWN_TRY_TTS "cooldown_try_tts"
+#define COOLDOWN_EVACUATION "evacuation"
+#define COOLDOWN_SENTIENT_HUGGER "sentient_hugger"
 
 //Mecha cooldowns
 #define COOLDOWN_MECHA "mecha"

code/__DEFINES/dcs/signals.dm

@@ -1066,3 +1066,77 @@ RU TGMC EDIT */
 #define COMSIG_PUPPET_CHANGE_ORDER "puppetchangeorder"
 #define COMSIG_PUPPET_CHANGE_ALL_ORDER "puppetglobalorder"
 RU TGMC EDIT */
+
+/// Xeno signals
+#define COMSIG_XENOABILITY_TEARING_TAIL "xenoability_tearing_tail"
+#define COMSIG_XENOABILITY_PANTHER_POUNCE "xenoability_panther_pounce"
+#define COMSIG_XENOABILITY_ADRENALINE_JUMP "xenoability_adrenaline_jump"
+#define COMSIG_XENOABILITY_ADRENALINE_RUSH "xenoability_adrenaline_rush"
+#define COMSIG_XENOABILITY_EVASIVE_MANEUVERS "xenoability_evasive_maneuvers"
+#define COMSIG_XENOABILITY_PANTHER_SELECT_REAGENT "xenoability_panther_select_reagent"
+
+#define COMSIG_XENOABILITY_DUMP_ACID "xenoability_dump_acid"
+
+#define COMSIG_XENOABILITY_PSYCHIC_GRAB "xenoability_psychic_grab"
+
+#define COMSING_XENOABILITY_HUGGER_POUNCE "xenoability_hugger_pounce"
+
+/// Predalien signals
+#define COMSIG_XENOABILITY_ROAR "xenoability_roar"
+#define COMSIG_XENOABILITY_SMASH "xenoability_smash"
+#define COMSIG_XENOABILITY_DEVASTATE "xenoability_devastate"
+
+/// Pred signals
+#define COMSIG_PRED_MARK_HUNT "pred_mark_hunt"
+#define COMSIG_PRED_MARK_PANEL "pred_mark_panel"
+#define COMSIG_PRED_ZOOM "pred_zoom"
+#define COMSIG_PRED_TOGGLESIGHT "pred_togglesight"
+#define COMSIG_PRED_COMBISTICK "pred_combistick"
+#define COMSIG_PRED_SMART_DISC "pred_smart_disc"
+#define COMSIG_PRED_TRANSLATOR "pred_translator"
+#define COMSIG_PRED_CRYSTAL "pred_crystal"
+#define COMSIG_PRED_CAPSULE "pred_capsule"
+#define COMSIG_PRED_WRISTBLADES "pred_wristblades"
+#define COMSIG_PRED_CASTER "pred_caster"
+#define COMSIG_PRED_CLOACK "pred_cloack"
+#define COMSIG_PRED_SD "pred_sd"
+#define COMSIG_PRED_SD_MODE "pred_sd_mode"
+
+/// From /datum/admins/proc/force_predator_round()
+#define COMSIG_GLOB_PREDATOR_ROUND_TOGGLED "!predator_round_toglged"
+
+#define COMSIG_XENOABILITY_PLASMA_SCREECH "xenoability_plasma_screech"
+#define COMSIG_XENOABILITY_FRENZY_SCREECH "xenoability_frenzy_screech"
+
+#define COMSIG_XENOABILITY_CHIMERA_PHANTOM "xenoability_chimera_phantom"
+#define COMSIG_XENOABILITY_CHIMERA_ABDUCTION "xenoability_chimera_abduction"
+#define COMSIG_XENOABILITY_CHIMERA_BLINK "xenoability_chimera_blink"
+#define COMSIG_XENOABILITY_CHIMERA_WARP_BLAST "xenoability_chimera_warp_blast"
+#define COMSIG_XENOABILITY_CHIMERA_BODYSWAP "xenoability_chimera_bodyswap"
+#define COMSIG_XENOABILITY_CHIMERA_CRIPPLING_STRIKE "xenoability_chimera_crippling_strike"
+
+//Preds
+#define COMSIG_GLOB_YAUTJA_ARMORY_OPENED "yautja_armory_opened"
+
+#define COMSIG_ATOM_TELEPORT "atom_teleport"
+
+#define COMSIG_ATTEMPT_MOB_PULL "attempt_mob_pull"
+	#define COMPONENT_CANCEL_MOB_PULL (1<<0)
+
+#define COMSIG_ITEM_ATTEMPT_ATTACK "item_attempt_attack"		//Triggered on the target mob.
+
+/// From /mob/living/verb/resist()
+#define COMSIG_MOB_RECALCULATE_CLIENT_COLOR "mob_recalc_client_color"
+
+/// From /mob/living/carbon/human/ExtinguishMob()
+#define COMSIG_HUMAN_EXTINGUISH "human_extinguish"
+
+/// From /datum/flaying_datum
+#define COMSIG_HUMAN_FLAY_ATTEMPT "human_flay_attempt"
+
+#define COMSIG_XENOMORPH_INTERFERENCE "xenomorph_interference"
+
+#define COMSIG_XENOABILITY_CRESTTOSS_BEHIND "xenoability_cresttoss_behind"
+
+///mob/living signals
+#define COMSIG_HUMAN_DEATH_STAGE_CHANGE "human_death_stage_change"

code/__DEFINES/equipment.dm

@@ -86,6 +86,7 @@
 #define HAS_UNDERLAY (1<<18)
 ///is this item equipped into an inventory slot or hand of a mob?
 #define IN_INVENTORY (1<<19)
+#define ITEM_PREDATOR (1<<20)
 
 //flags_storage
 ///If a storage container can be restocked into a vendor

code/__DEFINES/footsteps.dm

@@ -22,6 +22,8 @@
 #define FOOTSTEP_MOB_SHOE 3
 #define FOOTSTEP_MOB_HUMAN 4 //Warning: Only works on /mob/living/carbon/human
 #define FOOTSTEP_XENO_MEDIUM 5
+#define FOOTSTEP_XENO_STOMPY 6
+#define FOOTSTEP_PREDALIEN_STOMPY 7
 
 GLOBAL_LIST_INIT(shoefootstep, list(
 	FOOTSTEP_WOOD = list(list(
@@ -354,3 +356,124 @@ GLOBAL_LIST_INIT(xenoheavystep, list(
 		'sound/effects/footstep/heavy2.ogg',
 		'sound/effects/footstep/heavy3.ogg'), 100, 2),
 ))
+
+//claw footsteps lists
+GLOBAL_LIST_INIT(xenostompy, list(
+	FOOTSTEP_WOOD = list(list(
+		'sound/effects/footstep/alien_footstep_large1.ogg',
+		'sound/effects/footstep/alien_footstep_large2.ogg',
+		'sound/effects/footstep/alien_footstep_large3.ogg'), 60, 1),
+	FOOTSTEP_PLATING = list(list(
+		'sound/effects/footstep/alien_footstep_large1.ogg',
+		'sound/effects/footstep/alien_footstep_large2.ogg',
+		'sound/effects/footstep/alien_footstep_large3.ogg'), 70, 1),
+	FOOTSTEP_FLOOR = list(list(
+		'sound/effects/footstep/alien_footstep_large1.ogg',
+		'sound/effects/footstep/alien_footstep_large2.ogg',
+		'sound/effects/footstep/alien_footstep_large3.ogg'), 70, 1),
+	FOOTSTEP_HARD = list(list(
+		'sound/effects/footstep/alien_footstep_large1.ogg',
+		'sound/effects/footstep/alien_footstep_large2.ogg',
+		'sound/effects/footstep/alien_footstep_large3.ogg'), 70, 1),
+	FOOTSTEP_CARPET = list(list(
+		'sound/effects/footstep/alien_footstep_large1.ogg',
+		'sound/effects/footstep/alien_footstep_large2.ogg',
+		'sound/effects/footstep/alien_footstep_large3.ogg'), 55, -1),
+	FOOTSTEP_SAND = list(list(
+		'sound/effects/footstep/alien_footstep_large1.ogg',
+		'sound/effects/footstep/alien_footstep_large2.ogg',
+		'sound/effects/footstep/alien_footstep_large3.ogg'), 55, 1),
+	FOOTSTEP_GRASS = list(list(
+		'sound/effects/footstep/alien_footstep_large1.ogg',
+		'sound/effects/footstep/alien_footstep_large2.ogg',
+		'sound/effects/footstep/alien_footstep_large3.ogg'), 65, 1),
+	FOOTSTEP_WATER = list(list(
+		'sound/effects/footstep/water1.ogg',
+		'sound/effects/footstep/water2.ogg',
+		'sound/effects/footstep/water3.ogg',
+		'sound/effects/footstep/water4.ogg'), 50, 1),
+	FOOTSTEP_CATWALK = list(list(
+		'sound/effects/footstep/alien_footstep_large1.ogg',
+		'sound/effects/footstep/alien_footstep_large2.ogg',
+		'sound/effects/footstep/alien_footstep_large3.ogg'), 70, 1),
+	FOOTSTEP_SNOW = list(list(
+		'sound/effects/footstep/alien_footstep_large1.ogg',
+		'sound/effects/footstep/alien_footstep_large2.ogg',
+		'sound/effects/footstep/alien_footstep_large3.ogg'), 70, 1),
+	FOOTSTEP_ICE = list(list(
+		'sound/effects/footstep/alien_footstep_large1.ogg',
+		'sound/effects/footstep/alien_footstep_large2.ogg',
+		'sound/effects/footstep/alien_footstep_large3.ogg'), 50, 1),
+	FOOTSTEP_CONCRETE = list(list(
+		'sound/effects/footstep/alien_footstep_large1.ogg',
+		'sound/effects/footstep/alien_footstep_large2.ogg',
+		'sound/effects/footstep/alien_footstep_large3.ogg'), 70, 1),
+	FOOTSTEP_GRAVEL = list(list(
+		'sound/effects/footstep/alien_footstep_large1.ogg',
+		'sound/effects/footstep/alien_footstep_large2.ogg',
+		'sound/effects/footstep/alien_footstep_large3.ogg'), 55, 1),
+	FOOTSTEP_RESIN = list(list(
+		'sound/effects/footstep/alien_footstep_large1.ogg',
+		'sound/effects/footstep/alien_footstep_large2.ogg',
+		'sound/effects/footstep/alien_footstep_large3.ogg'), 40, -1),
+	))
+
+GLOBAL_LIST_INIT(predalienstompy, list(
+	FOOTSTEP_WOOD = list(list(
+		'sound/effects/footstep/alien_footstep_medium1.ogg',
+		'sound/effects/footstep/alien_footstep_medium2.ogg',
+		'sound/effects/footstep/alien_footstep_medium3.ogg'), 60, 1),
+	FOOTSTEP_PLATING = list(list(
+		'sound/effects/footstep/alien_footstep_medium1.ogg',
+		'sound/effects/footstep/alien_footstep_medium2.ogg',
+		'sound/effects/footstep/alien_footstep_medium3.ogg'), 70, 1),
+	FOOTSTEP_FLOOR = list(list(
+		'sound/effects/footstep/alien_footstep_medium1.ogg',
+		'sound/effects/footstep/alien_footstep_medium2.ogg',
+		'sound/effects/footstep/alien_footstep_medium3.ogg'), 70, 1),
+	FOOTSTEP_HARD = list(list(
+		'sound/effects/footstep/alien_footstep_medium1.ogg',
+		'sound/effects/footstep/alien_footstep_medium2.ogg',
+		'sound/effects/footstep/alien_footstep_medium3.ogg'), 70, 1),
+	FOOTSTEP_CARPET = list(list(
+		'sound/effects/footstep/alien_footstep_medium1.ogg',
+		'sound/effects/footstep/alien_footstep_medium2.ogg',
+		'sound/effects/footstep/alien_footstep_medium3.ogg'), 55, -1),
+	FOOTSTEP_SAND = list(list(
+		'sound/effects/footstep/alien_footstep_medium1.ogg',
+		'sound/effects/footstep/alien_footstep_medium2.ogg',
+		'sound/effects/footstep/alien_footstep_medium3.ogg'), 55, 1),
+	FOOTSTEP_GRASS = list(list(
+		'sound/effects/footstep/alien_footstep_medium1.ogg',
+		'sound/effects/footstep/alien_footstep_medium2.ogg',
+		'sound/effects/footstep/alien_footstep_medium3.ogg'), 65, 1),
+	FOOTSTEP_WATER = list(list(
+		'sound/effects/footstep/water1.ogg',
+		'sound/effects/footstep/water2.ogg',
+		'sound/effects/footstep/water3.ogg',
+		'sound/effects/footstep/water4.ogg'), 50, 1),
+	FOOTSTEP_CATWALK = list(list(
+		'sound/effects/footstep/alien_footstep_medium1.ogg',
+		'sound/effects/footstep/alien_footstep_medium2.ogg',
+		'sound/effects/footstep/alien_footstep_medium3.ogg'), 70, 1),
+	FOOTSTEP_SNOW = list(list(
+		'sound/effects/footstep/alien_footstep_medium1.ogg',
+		'sound/effects/footstep/alien_footstep_medium2.ogg',
+		'sound/effects/footstep/alien_footstep_medium3.ogg'), 70, 1),
+	FOOTSTEP_ICE = list(list(
+		'sound/effects/footstep/alien_footstep_medium1.ogg',
+		'sound/effects/footstep/alien_footstep_medium2.ogg',
+		'sound/effects/footstep/alien_footstep_medium3.ogg'), 50, 1),
+	FOOTSTEP_CONCRETE = list(list(
+		'sound/effects/footstep/alien_footstep_medium1.ogg',
+		'sound/effects/footstep/alien_footstep_medium2.ogg',
+		'sound/effects/footstep/alien_footstep_medium3.ogg'), 70, 1),
+	FOOTSTEP_GRAVEL = list(list(
+		'sound/effects/footstep/alien_footstep_medium1.ogg',
+		'sound/effects/footstep/alien_footstep_medium2.ogg',
+		'sound/effects/footstep/alien_footstep_medium3.ogg'), 55, 1),
+	FOOTSTEP_RESIN = list(list(
+		'sound/effects/footstep/alien_footstep_medium1.ogg',
+		'sound/effects/footstep/alien_footstep_medium2.ogg',
+		'sound/effects/footstep/alien_footstep_medium3.ogg'), 40, -1),
+	))