forked from PentestSS13/Pentest
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> finishes shiptest-ss13/Shiptest#1785 Todo - [x] Init icons are broken - [x] Do afters can be canceled by walking <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> :cl: FalloutFalcon, MrSamu99, Fikou add: a few shipments of MOD control units have found there way to the frontier, premium versions of existing hard suits with the latest tech! add: Ported modsuits from tg, no mapped stuff yet /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: thgvr <[email protected]> Signed-off-by: FalloutFalcon <[email protected]> Co-authored-by: MrSamu99 <[email protected]> Co-authored-by: MrSamu99 <[email protected]> Co-authored-by: thgvr <[email protected]>
- Loading branch information
1 parent
666e5ec
commit 6a0ce72
Showing
116 changed files
with
8,858 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
///Action button checks if hands are unusable | ||
#define AB_CHECK_HANDS_BLOCKED (1<<0) | ||
///Action button checks if user is immobile | ||
#define AB_CHECK_IMMOBILE (1<<1) | ||
///Action button checks if user is resting | ||
#define AB_CHECK_LYING (1<<2) | ||
///Action button checks if user is conscious | ||
#define AB_CHECK_CONSCIOUS (1<<3) | ||
|
||
///Action button triggered with right click | ||
#define TRIGGER_SECONDARY_ACTION (1<<0) | ||
|
||
// Defines for formatting cooldown actions for the stat panel. | ||
/// The stat panel the action is displayed in. | ||
#define PANEL_DISPLAY_PANEL "panel" | ||
/// The status shown in the stat panel. | ||
/// Can be stuff like "ready", "on cooldown", "active", "charges", "charge cost", etc. | ||
#define PANEL_DISPLAY_STATUS "status" | ||
/// The name shown in the stat panel. | ||
#define PANEL_DISPLAY_NAME "name" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
code/__DEFINES/dcs/signals/signals_mob/signals_mob_carbon.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
///Called from /mob/living/carbon/help_shake_act, before any hugs have ocurred. (mob/living/helper) | ||
#define COMSIG_CARBON_PRE_HELP_ACT "carbon_pre_help" | ||
/// Stops the rest of help act (hugging, etc) from occuring | ||
#define COMPONENT_BLOCK_HELP_ACT (1<<0) | ||
|
||
///Called from /mob/living/carbon/help_shake_act on the person being helped, after any hugs have ocurred. (mob/living/helper) | ||
#define COMSIG_CARBON_HELP_ACT "carbon_help" | ||
///Called from /mob/living/carbon/help_shake_act on the helper, after any hugs have ocurred. (mob/living/helped) | ||
#define COMSIG_CARBON_HELPED "carbon_helped_someone" | ||
|
||
///Before a carbon mob is shoved, sent to the turf we're trying to shove onto (mob/living/carbon/shover, mob/living/carbon/target) | ||
#define COMSIG_CARBON_DISARM_PRESHOVE "carbon_disarm_preshove" | ||
#define COMSIG_CARBON_ACT_SOLID (1<<0) //Tells disarm code to act as if the mob was shoved into something solid, even we we're not | ||
///When a carbon mob is disarmed, this is sent to the turf we're trying to shove onto (mob/living/carbon/shover, mob/living/carbon/target, shove_blocked) | ||
#define COMSIG_CARBON_DISARM_COLLIDE "carbon_disarm_collision" | ||
#define COMSIG_CARBON_SHOVE_HANDLED (1<<0) | ||
|
||
// /mob/living/carbon physiology signals | ||
#define COMSIG_CARBON_GAIN_WOUND "carbon_gain_wound" //from /datum/wound/proc/apply_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L) | ||
#define COMSIG_CARBON_LOSE_WOUND "carbon_lose_wound" //from /datum/wound/proc/remove_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L) | ||
///from base of /obj/item/bodypart/proc/attach_limb(): (new_limb, special) allows you to fail limb attachment | ||
#define COMSIG_CARBON_ATTACH_LIMB "carbon_attach_limb" | ||
#define COMSIG_CARBON_REMOVE_LIMB "carbon_remove_limb" //from base of /obj/item/bodypart/proc/drop_limb(lost_limb, dismembered) | ||
#define COMSIG_BODYPART_GAUZED "bodypart_gauzed" // from /obj/item/bodypart/proc/apply_gauze(/obj/item/stack/gauze) | ||
#define COMSIG_BODYPART_GAUZE_DESTROYED "bodypart_degauzed" // from [/obj/item/bodypart/proc/seep_gauze] when it runs out of absorption | ||
|
||
///Called when someone attempts to cuff a carbon | ||
#define COMSIG_CARBON_CUFF_ATTEMPTED "carbon_attempt_cuff" | ||
///Called when a carbon mutates (source = dna, mutation = mutation added) | ||
#define COMSIG_CARBON_GAIN_MUTATION "carbon_gain_mutation" | ||
///Called when a carbon loses a mutation (source = dna, mutation = mutation lose) | ||
#define COMSIG_CARBON_LOSE_MUTATION "carbon_lose_mutation" | ||
///Called when a carbon becomes addicted (source = what addiction datum, addicted_mind = mind of the addicted carbon) | ||
#define COMSIG_CARBON_GAIN_ADDICTION "carbon_gain_addiction" | ||
///Called when a carbon is no longer addicted (source = what addiction datum was lost, addicted_mind = mind of the freed carbon) | ||
#define COMSIG_CARBON_LOSE_ADDICTION "carbon_lose_addiction" | ||
///Called when a carbon gets a brain trauma (source = carbon, trauma = what trauma was added) - this is before on_gain() | ||
#define COMSIG_CARBON_GAIN_TRAUMA "carbon_gain_trauma" | ||
///Called when a carbon loses a brain trauma (source = carbon, trauma = what trauma was removed) | ||
#define COMSIG_CARBON_LOSE_TRAUMA "carbon_lose_trauma" | ||
///Called when a carbon updates their health (source = carbon) | ||
#define COMSIG_CARBON_HEALTH_UPDATE "carbon_health_update" | ||
///Called when a carbon updates their sanity (source = carbon) | ||
#define COMSIG_CARBON_SANITY_UPDATE "carbon_sanity_update" | ||
///Called when a carbon breathes, before the breath has actually occured | ||
#define COMSIG_CARBON_PRE_BREATHE "carbon_pre_breathe" | ||
///Called when a carbon updates their mood | ||
#define COMSIG_CARBON_MOOD_UPDATE "carbon_mood_update" | ||
|
||
// /mob/living/carbon/human signals | ||
|
||
///Hit by successful disarm attack (mob/living/carbon/human/attacker,zone_targeted) | ||
#define COMSIG_HUMAN_DISARM_HIT "human_disarm_hit" | ||
///Whenever EquipRanked is called, called after job is set | ||
#define COMSIG_JOB_RECEIVED "job_received" | ||
///from /mob/living/carbon/human/proc/set_coretemperature(): (oldvalue, newvalue) | ||
#define COMSIG_HUMAN_CORETEMP_CHANGE "human_coretemp_change" | ||
///from /datum/species/handle_fire. Called when the human is set on fire and burning clothes and stuff | ||
#define COMSIG_HUMAN_BURNING "human_burning" | ||
///from mob/living/carbon/human/UnarmedAttack(): (atom/target, proximity, modifiers) | ||
#define COMSIG_HUMAN_EARLY_UNARMED_ATTACK "human_early_unarmed_attack" | ||
///from mob/living/carbon/human/UnarmedAttack(): (atom/target, proximity, modifiers) | ||
#define COMSIG_HUMAN_MELEE_UNARMED_ATTACK "human_melee_unarmed_attack" | ||
//from mob/living/carbon/human/UnarmedAttack(): (mob/living/carbon/human/attacker) | ||
#define COMSIG_HUMAN_MELEE_UNARMED_ATTACKBY "human_melee_unarmed_attackby" | ||
//from /mob/living/carbon/human/proc/check_shields(): (atom/hit_by, damage, attack_text, attack_type, armour_penetration) | ||
#define COMSIG_HUMAN_CHECK_SHIELDS "human_check_shields" | ||
#define SHIELD_BLOCK (1<<0) | ||
|
||
// Mob transformation signals | ||
///Called when a human turns into a monkey, from /mob/living/carbon/proc/finish_monkeyize() | ||
#define COMSIG_HUMAN_MONKEYIZE "human_monkeyize" | ||
///Called when a monkey turns into a human, from /mob/living/carbon/proc/finish_humanize(species) | ||
#define COMSIG_MONKEY_HUMANIZE "monkey_humanize" | ||
|
||
///From mob/living/carbon/human/suicide() | ||
#define COMSIG_HUMAN_SUICIDE_ACT "human_suicide_act" | ||
|
||
/// A mob has just equipped an item. Called on [/mob] from base of [/obj/item/equipped()]: (/obj/item/equipped_item, slot) | ||
#define COMSIG_MOB_EQUIPPED_ITEM "mob_equipped_item" | ||
/// A mob has just unequipped an item. | ||
#define COMSIG_MOB_UNEQUIPPED_ITEM "mob_unequipped_item" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
//MODsuit signals | ||
/// Called when a module is selected to be the active one from on_select(obj/item/mod/module/module) | ||
#define COMSIG_MOD_MODULE_SELECTED "mod_module_selected" | ||
/// Called when a MOD activation is called from toggle_activate(mob/user) | ||
#define COMSIG_MOD_ACTIVATE "mod_activate" | ||
/// Cancels the suit's activation | ||
#define MOD_CANCEL_ACTIVATE (1 << 0) | ||
/// Called when a MOD is having modules removed from crowbar_act(mob/user, obj/crowbar) | ||
#define COMSIG_MOD_MODULE_REMOVAL "mod_module_removal" | ||
/// Cancels the removal of modules | ||
#define MOD_CANCEL_REMOVAL (1 << 0) | ||
/// Called when a module attempts to activate, however it does. At the end of checks so you can add some yourself, or work on trigger behavior (mob/user) | ||
#define COMSIG_MODULE_TRIGGERED "mod_module_triggered" | ||
// Cancels activation, with no message. include feedback on your cancel. | ||
#define MOD_ABORT_USE (1<<0) | ||
/// Called when a module activates, after all checks have passed and cooldown started. | ||
#define COMSIG_MODULE_ACTIVATED "mod_module_activated" | ||
/// Called when a module deactivates, after all checks have passed. | ||
#define COMSIG_MODULE_DEACTIVATED "mod_module_deactivated" | ||
/// Called when a module is used, after all checks have passed and cooldown started. | ||
#define COMSIG_MODULE_USED "mod_module_used" | ||
/// Called when the MODsuit wearer is set. | ||
#define COMSIG_MOD_WEARER_SET "mod_wearer_set" | ||
/// Called when the MODsuit wearer is unset. | ||
#define COMSIG_MOD_WEARER_UNSET "mod_wearer_unset" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
/// Sent when /datum/storage/dump_content_at(): (obj/item/storage_source, mob/user) | ||
#define COMSIG_STORAGE_DUMP_CONTENT "storage_dump_contents" | ||
/// Return to stop the standard dump behavior. | ||
#define STORAGE_DUMP_HANDLED (1<<0) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/// Default value for the max_complexity var on MODsuits | ||
#define DEFAULT_MAX_COMPLEXITY 15 | ||
|
||
/// Default cell drain per process on MODsuits | ||
#define DEFAULT_CHARGE_DRAIN 0.09 | ||
|
||
/// Default time for a part to seal | ||
#define MOD_ACTIVATION_STEP_TIME (2 SECONDS) | ||
|
||
/// Passive module, just acts when put in naturally. | ||
#define MODULE_PASSIVE 0 | ||
/// Usable module, does something when you press a button. | ||
#define MODULE_USABLE 1 | ||
/// Toggle module, you turn it on/off and it does stuff. | ||
#define MODULE_TOGGLE 2 | ||
/// Actively usable module, you may only have one selected at a time. | ||
#define MODULE_ACTIVE 3 | ||
|
||
//Defines used by the theme for clothing flags and similar | ||
#define CONTROL_LAYER "control_layer" | ||
#define HELMET_FLAGS "helmet_flags" | ||
#define CHESTPLATE_FLAGS "chestplate_flags" | ||
#define GAUNTLETS_FLAGS "gauntlets_flags" | ||
#define BOOTS_FLAGS "boots_flags" | ||
|
||
#define UNSEALED_LAYER "unsealed_layer" | ||
#define UNSEALED_CLOTHING "unsealed_clothing" | ||
#define SEALED_CLOTHING "sealed_clothing" | ||
#define UNSEALED_INVISIBILITY "unsealed_invisibility" | ||
#define SEALED_INVISIBILITY "sealed_invisibility" | ||
#define UNSEALED_COVER "unsealed_cover" | ||
#define SEALED_COVER "sealed_cover" | ||
#define CAN_OVERSLOT "can_overslot" | ||
|
||
//Defines used to override MOD clothing's icon and worn icon files in the skin. | ||
#define MOD_ICON_OVERRIDE "mod_icon_override" | ||
#define MOD_WORN_ICON_OVERRIDE "mod_worn_icon_override" | ||
|
||
/// Global list of all /datum/mod_theme | ||
GLOBAL_LIST_INIT(mod_themes, setup_mod_themes()) |
Oops, something went wrong.