Skip to content
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
8 changes: 7 additions & 1 deletion code/__DEFINES/exosuit_fab.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
/// Module is compatible with "Working" Exosuit models - Ripley and Clarke
#define EXOSUIT_MODULE_WORKING (EXOSUIT_MODULE_RIPLEY | EXOSUIT_MODULE_CLARKE)
/// Module is compatible with "Combat" Exosuit models - Gygax, H.O.N.K, Durand and Phazon, or any Exosuit with an empty Concealed Weapon Bay
#define EXOSUIT_MODULE_COMBAT (EXOSUIT_MODULE_GYGAX | EXOSUIT_MODULE_HONK | EXOSUIT_MODULE_DURAND | EXOSUIT_MODULE_PHAZON | EXOSUIT_MODULE_SAVANNAH | EXOSUIT_MODULE_RETICENCE | EXOSUIT_MODULE_MARAUDER | EXOSUIT_MODULE_PADDY | EXOSUIT_MODULE_CONCEALED_WEP_BAY)

// MASSMETA EDIT ADDITION START (uplink_items) ORIGINAL: #define EXOSUIT_MODULE_COMBAT (EXOSUIT_MODULE_GYGAX | EXOSUIT_MODULE_HONK | EXOSUIT_MODULE_DURAND | EXOSUIT_MODULE_PHAZON | EXOSUIT_MODULE_SAVANNAH | EXOSUIT_MODULE_RETICENCE | EXOSUIT_MODULE_MARAUDER | EXOSUIT_MODULE_PADDY | EXOSUIT_MODULE_CONCEALED_WEP_BAY)

#define EXOSUIT_MODULE_COMBAT (EXOSUIT_MODULE_GYGAX | EXOSUIT_MODULE_HONK | EXOSUIT_MODULE_DURAND | EXOSUIT_MODULE_PHAZON | EXOSUIT_MODULE_SAVANNAH | EXOSUIT_MODULE_RETICENCE | EXOSUIT_MODULE_MARAUDER | EXOSUIT_MODULE_PADDY | EXOSUIT_MODULE_JUSTICE | EXOSUIT_MODULE_CONCEALED_WEP_BAY)

// MASSMETA EDIT ADDITION END (uplink_items)

/// Module is compatible with "Medical" Exosuit modelsm - Odysseus
#define EXOSUIT_MODULE_MEDICAL EXOSUIT_MODULE_ODYSSEUS
12 changes: 8 additions & 4 deletions code/modules/vehicles/mecha/mech_fabricator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,10 @@

if(design.build_type & MECHFAB)
cached_designs |= design

// // MASSMETA EDIT ADDITION START (uplink_items (justice_mecha))
for(var/datum/design/illegal_disign in illegal_local_designs)
cached_designs |= illegal_disign
// MASSMETA EDIT ADDTION END (uplink_items (justice_mecha))
var/design_delta = cached_designs.len - previous_design_count

if(design_delta > 0)
Expand Down Expand Up @@ -429,10 +432,11 @@
for(var/design_id in designs)
if(!istext(design_id))
continue

if(!stored_research.researched_designs.Find(design_id))
// MASSMETA EDIT CHANGE START (uplink_items (justice_mecha))
// ORIGINAL: if(!(stored_research.researched_designs.Find(design_id))
if(!(stored_research.researched_designs.Find(design_id) || is_type_in_list(SSresearch.techweb_design_by_id(design_id), illegal_local_designs)))
continue

// MASSMETA EDIT CHANGE END
var/datum/design/design = SSresearch.techweb_design_by_id(design_id)

if(!(design.build_type & MECHFAB) || design.id != design_id)
Expand Down
1 change: 1 addition & 0 deletions modular_meta/_defines/_main_modular_defines_include.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
#include "antagonists.dm"
#include "hardsuit.dm"
#include "re_hooch_heals_assistants.dm"
#include "justice_mecha.dm"
25 changes: 25 additions & 0 deletions modular_meta/_defines/justice_mecha.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/// Module is compatible with Justice models
#define EXOSUIT_MODULE_JUSTICE (1<<12)

/// Defines for Justice mech
#define JUSTICE_IDLE "idle"
#define JUSTICE_CHARGE "charge"
#define JUSTICE_INVISIBILITY "invisibility"
#define JUSTICE_INVISIBILITY_ATTACK "invisibility attack"
#define JUSTICE_FATALITY "fatality"

#define JUSTICE_ENGINE_ACTIVE "active"
#define JUSTICE_ENGINE_ACTIVATING "activating"
#define JUSTICE_ENGINE_ONCOOLDOWN "oncooldown"
#define JUSTICE_ENGINE_DEACTIVATING "deactivating"
#define JUSTICE_ENGINE_DEACTIVE "deactive"

#define COMSIG_JUSTICE_ATTACK_AOE "justice_attack_aoe"
#define COMSIG_JUSTICE_CHARGE_BUTTON_DOWN "justice_charge_button_down"

#define COMSIG_JUSTICE_INVISIBILITY_ACTIVATE "justice_invisibility_activate"
#define COMPONENT_CANCEL_JUSTICE_INVISIBILITY_ACTIVATE (1<<0)
#define COMSIG_JUSTICE_INVISIBILITY_DEACTIVATE "justice_invisibility_deactivate"
#define COMPONENT_CANCEL_JUSTICE_INVISIBILITY_DEACTIVATE (1<<0)

#define RND_CATEGORY_MECHFAB_JUSTICE "/Justice"
Loading
Loading