Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repaths cm_preds files to predator. #33

Merged
merged 2 commits into from
Jul 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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/cm_preds/_yaut_defines.dm

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//Items specific to yautja. Other people can use em, they're not restricted or anything.
//They can't, however, activate any of the special functions.
//Thrall subtypes are located in /code/modules/cm_preds/thrall_items.dm
//Thrall subtypes are located in /code/modules/predator/thrall_items.dm

/proc/add_to_missing_pred_gear(obj/item/W)
if(!is_centcom_level(W.z))
Expand Down
43 changes: 21 additions & 22 deletions tgmc.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1398,28 +1398,6 @@
#include "code\modules\clothing\under\jobs\engineering.dm"
#include "code\modules\clothing\under\jobs\medsci.dm"
#include "code\modules\clothing\under\jobs\security.dm"
#include "code\modules\cm_preds\_yaut_defines.dm"
#include "code\modules\cm_preds\falcon.dm"
#include "code\modules\cm_preds\huntdata.dm"
#include "code\modules\cm_preds\keybinds.dm"
#include "code\modules\cm_preds\landmakrs.dm"
#include "code\modules\cm_preds\predator_action.dm"
#include "code\modules\cm_preds\smartdisc.dm"
#include "code\modules\cm_preds\thrall_items.dm"
#include "code\modules\cm_preds\thrall_procs.dm"
#include "code\modules\cm_preds\yaut_bracers.dm"
#include "code\modules\cm_preds\yaut_chems.dm"
#include "code\modules\cm_preds\yaut_hudprocs.dm"
#include "code\modules\cm_preds\yaut_items.dm"
#include "code\modules\cm_preds\yaut_machines.dm"
#include "code\modules\cm_preds\yaut_mask.dm"
#include "code\modules\cm_preds\yaut_procs.dm"
#include "code\modules\cm_preds\yaut_shield.dm"
#include "code\modules\cm_preds\yautja_rope.dm"
#include "code\modules\cm_preds\yautja_weapons\misc_weapons.dm"
#include "code\modules\cm_preds\yautja_weapons\one_handed.dm"
#include "code\modules\cm_preds\yautja_weapons\ranged.dm"
#include "code\modules\cm_preds\yautja_weapons\two_handed.dm"
#include "code\modules\codex\codex_atom.dm"
#include "code\modules\codex\codex_client.dm"
#include "code\modules\codex\codex_mob.dm"
Expand Down Expand Up @@ -1882,6 +1860,27 @@
#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\falcon.dm"
#include "code\modules\predator\huntdata.dm"
#include "code\modules\predator\keybinds.dm"
#include "code\modules\predator\landmakrs.dm"
#include "code\modules\predator\predator_action.dm"
#include "code\modules\predator\smartdisc.dm"
#include "code\modules\predator\thrall\items.dm"
#include "code\modules\predator\thrall\procs.dm"
#include "code\modules\predator\yautja\bracers.dm"
#include "code\modules\predator\yautja\chems.dm"
#include "code\modules\predator\yautja\hudprocs.dm"
#include "code\modules\predator\yautja\items.dm"
#include "code\modules\predator\yautja\machines.dm"
#include "code\modules\predator\yautja\mask.dm"
#include "code\modules\predator\yautja\procs.dm"
#include "code\modules\predator\yautja\shield.dm"
#include "code\modules\predator\yautja\rope.dm"
#include "code\modules\predator\yautja\weapons\misc_weapons.dm"
#include "code\modules\predator\yautja\weapons\one_handed.dm"
#include "code\modules\predator\yautja\weapons\ranged.dm"
#include "code\modules\predator\yautja\weapons\two_handed.dm"
#include "code\modules\projectiles\ammo_datums.dm"
#include "code\modules\projectiles\ammunition.dm"
#include "code\modules\projectiles\gun_attachables.dm"
Expand Down
Loading