Skip to content

Commit

Permalink
eh
Browse files Browse the repository at this point in the history
  • Loading branch information
Helg2 committed Jul 20, 2024
1 parent a4235b7 commit 4837e23
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 26 deletions.
29 changes: 26 additions & 3 deletions code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ GLOBAL_LIST_INIT(xenoupgradetiers, list(XENO_UPGRADE_BASETYPE, XENO_UPGRADE_INVA
#define IS_MOTH (1<<3)
#define IS_SECTOID (1<<4)
#define IS_MONKEY (1<<5)
#define IS_YAUTJA (1<<6)
//=================================================

//AFK status
Expand Down Expand Up @@ -871,7 +872,6 @@ GLOBAL_LIST_INIT(human_body_parts, list(BODY_ZONE_HEAD,
///Slowdown for favehuggers moving through liquid
#define FACEHUGGER_WATER_SLOWDOWN 1.6


//Species defines

///Human species or those that functional behave like them. Default species
Expand All @@ -888,12 +888,35 @@ GLOBAL_LIST_INIT(human_body_parts, list(BODY_ZONE_HEAD,
///Default damage for slamming a mob against another mob
#define BASE_MOB_SLAM_DAMAGE 8

#define IS_YAUTJA (1<<6)

#define MOTH_WINGS_LAYER 28
#define MUTATIONS_LAYER 27
#define DAMAGE_LAYER 26
#define FLAY_LAYER 25
#define PRED_LASER_LAYER 1.9
#define LASER_LAYER 1.8
#define TOTAL_LAYERS 30

// Yautja defines

//Gear select defines
#define YAUTJA_GEAR_GLAIVE "The Lumbering Glaive"
#define YAUTJA_GEAR_WHIP "The Rending Chain-Whip"
#define YAUTJA_GEAR_SWORD "The Piercing Hunting Sword"
#define YAUTJA_GEAR_SCYTHE "The Cleaving War-Scythe"
#define YAUTJA_GEAR_STICK "The Adaptive Combi-Stick"
#define YAUTJA_GEAR_SPEAR "The Nimble Spear"
#define YAUTJA_GEAR_SCIMS "The Fearsome Scimitars"
#define YAUTJA_GEAR_LAUNCHER "The Fleeting Spike Launcher"
#define YAUTJA_GEAR_PISTOL "The Swift Plasma Pistol"
#define YAUTJA_GEAR_DISC "The Purifying Smart-Disc"
#define YAUTJA_GEAR_FULL_ARMOR "The Formidable Plate Armor"
#define YAUTJA_GEAR_SHIELD "The Steadfast Shield"
#define YAUTJA_GEAR_DRONE "The Agile Drone"

#define YAUTJA_GEAR_GLAIVE_ALT "The Imposing Glaive"
#define YAUTJA_GEAR_SCYTHE_ALT "The Ripping War-Scythe"

#define YAUTJA_THRALL_GEAR_MACHETE "The Swift Machete"
#define YAUTJA_THRALL_GEAR_RAPIER "The Dancing Rapier"
#define YAUTJA_THRALL_GEAR_CLAYMORE "The Broad Claymore"
#define YAUTJA_THRALL_GEAR_FIREAXE "The Purposeful Fireaxe"
22 changes: 0 additions & 22 deletions code/modules/predator/_defines.dm

This file was deleted.

1 change: 0 additions & 1 deletion tgmc.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,6 @@
#include "code\modules\power\apc\apc_attack.dm"
#include "code\modules\power\apc\apc_tool_act.dm"
#include "code\modules\power\singularity\emitter.dm"
#include "code\modules\predator\_defines.dm"
#include "code\modules\predator\falcon.dm"
#include "code\modules\predator\huntdata.dm"
#include "code\modules\predator\keybinds.dm"
Expand Down

0 comments on commit 4837e23

Please sign in to comment.