Invasion of the moffs (#17000)

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
This commit is contained in:
S34N
2022-02-23 20:37:37 +01:00
committed by GitHub
co-authored by AffectedArc07 mochi
parent 1aa4222695
commit a5bc67cd43
55 changed files with 880 additions and 161 deletions
+9
View File
@@ -367,6 +367,10 @@
#define COMSIG_MOB_CLIENT_LOGIN "comsig_mob_client_login"
///sent from borg mobs to itself, for tools to catch an upcoming destroy() due to safe decon (rather than detonation)
#define COMSIG_BORG_SAFE_DECONSTRUCT "borg_safe_decon"
///sent from living mobs every tick of fire
#define COMSIG_LIVING_FIRE_TICK "living_fire_tick"
//sent from living mobs when they are ahealed
#define COMSIG_LIVING_AHEAL "living_aheal"
//ALL OF THESE DO NOT TAKE INTO ACCOUNT WHETHER AMOUNT IS 0 OR LOWER AND ARE SENT REGARDLESS!
@@ -585,6 +589,11 @@
#define COMSIG_JOB_RECEIVED "job_received"
// called after DNA is updated
#define COMSIG_HUMAN_UPDATE_DNA "human_update_dna"
/// From mob/living/carbon/human/change_body_accessory(): (mob/living/carbon/human/H, body_accessory_style)
#define COMSIG_HUMAN_CHANGE_BODY_ACCESSORY "human_change_body_accessory"
#define COMSIG_HUMAN_NO_CHANGE_APPEARANCE (1<<0)
/// From mob/living/carbon/human/change_head_accessory(): (mob/living/carbon/human/H, head_accessory_style)
#define COMSIG_HUMAN_CHANGE_HEAD_ACCESSORY "human_change_head_accessory"
// /datum/species signals
+5 -5
View File
@@ -47,12 +47,12 @@
#define DNA_UI_GENDER 32
#define DNA_UI_BEARD_STYLE 33
#define DNA_UI_HAIR_STYLE 34
/*#define DNA_UI_BACC_STYLE 23*/
#define DNA_UI_HACC_STYLE 35
#define DNA_UI_HEAD_MARK_STYLE 36
#define DNA_UI_BODY_MARK_STYLE 37
#define DNA_UI_TAIL_MARK_STYLE 38
#define DNA_UI_LENGTH 38 // Update this when you add something, or you WILL break shit.
#define DNA_UI_BACC_STYLE 36
#define DNA_UI_HEAD_MARK_STYLE 37
#define DNA_UI_BODY_MARK_STYLE 38
#define DNA_UI_TAIL_MARK_STYLE 39
#define DNA_UI_LENGTH 40 // Update this when you add something, or you WILL break shit.
#define DNA_SE_LENGTH 55 // Was STRUCDNASIZE, size 27. 15 new blocks added = 42, plus room to grow.
+8 -2
View File
@@ -80,11 +80,17 @@
#define HAS_HEAD_MARKINGS 64
#define HAS_BODY_MARKINGS 128
#define HAS_TAIL_MARKINGS 256
#define HAS_MARKINGS HAS_HEAD_MARKINGS|HAS_BODY_MARKINGS|HAS_TAIL_MARKINGS
#define TAIL_WAGGING 512
#define NO_EYES 1024
#define HAS_ALT_HEADS 2048
#define ALL_RPARTS 4096
#define HAS_WING 4096
#define HAS_BODYACC_COLOR 8192
#define BALD 16384
#define ALL_RPARTS 32768
//Pre-baked combinations of the above body flags
#define HAS_BODY_ACCESSORY HAS_TAIL|HAS_WING
#define HAS_MARKINGS HAS_HEAD_MARKINGS|HAS_BODY_MARKINGS|HAS_TAIL_MARKINGS
//Species Diet Flags
#define DIET_CARN 1
+3 -1
View File
@@ -162,6 +162,8 @@
#define MFOAM_IRON 2
//Human Overlays Indexes/////////
#define WING_LAYER 41
#define WING_UNDERLIMBS_LAYER 40
#define BODY_LAYER 39
#define MUTANTRACE_LAYER 38
#define TAIL_UNDERLIMBS_LAYER 37 //Tail split-rendering.
@@ -201,7 +203,7 @@
#define FIRE_LAYER 3 //If you're on fire
#define MISC_LAYER 2
#define FROZEN_LAYER 1
#define TOTAL_LAYERS 39
#define TOTAL_LAYERS 41
///Access Region Codes///
#define REGION_ALL 0
+1
View File
@@ -235,6 +235,7 @@
#define ismachineperson(A) (is_species(A, /datum/species/machine))
#define isdrask(A) (is_species(A, /datum/species/drask))
#define iswryn(A) (is_species(A, /datum/species/wryn))
#define ismoth(A) (is_species(A, /datum/species/moth))
#define isanimal(A) (istype((A), /mob/living/simple_animal))
#define isdog(A) (istype((A), /mob/living/simple_animal/pet/dog))
+6
View File
@@ -80,6 +80,12 @@
//#define STATUS_EFFECT_ICHORIAL_STAIN /datum/status_effect/ichorial_stain //Prevents a servant from being revived by vitality matrices for one minute.
/// Whether a moth's wings are burnt
#define STATUS_EFFECT_BURNT_WINGS /datum/status_effect/burnt_wings
/// If a moth is in a cocoon
#define STATUS_EFFECT_COCOONED /datum/status_effect/cocooned
/////////////
// NEUTRAL //
/////////////