diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index c6634a15b47..e168b89261d 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -140,7 +140,6 @@ #define ORGAN_SLOT_EXTERNAL_BODYMARKINGS "bodymarkings" #define ORGAN_SLOT_EXTERNAL_POD_HAIR "pod_hair" - /// Xenomorph organ slots #define ORGAN_SLOT_XENO_ACIDGLAND "acid_gland" #define ORGAN_SLOT_XENO_EGGSAC "eggsac" diff --git a/code/__DEFINES/basic_mobs.dm b/code/__DEFINES/basic_mobs.dm index eeff3f6d57f..8c544adb459 100644 --- a/code/__DEFINES/basic_mobs.dm +++ b/code/__DEFINES/basic_mobs.dm @@ -4,5 +4,4 @@ #define DEL_ON_DEATH (1<<0) #define FLIP_ON_DEATH (1<<1) #define REMAIN_DENSE_WHILE_DEAD (1<<2) - #define FLAMMABLE_MOB (1<<3) diff --git a/code/__DEFINES/blob_defines.dm b/code/__DEFINES/blob_defines.dm index 4594f9eac50..a3ec5e22061 100644 --- a/code/__DEFINES/blob_defines.dm +++ b/code/__DEFINES/blob_defines.dm @@ -13,7 +13,8 @@ // Generic blob defines -#define BLOB_BASE_POINT_RATE 2.5 // Base amount of points per process(+1 SkyRat change) +//#define BLOB_BASE_POINT_RATE 2 // Base amount of points per process() +#define BLOB_BASE_POINT_RATE 2.5 // SKYRAT EDIT CHANGE #define BLOB_EXPAND_COST 4 // Price to expand onto a new tile #define BLOB_ATTACK_REFUND 2 // Points 'refunded' when the expand attempt actually attacks something instead #define BLOB_BRUTE_RESIST 0.5 // Brute damage taken gets multiplied by this value diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 82d9a70eb7e..f3151f64e0b 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -341,7 +341,3 @@ GLOBAL_LIST_INIT(cable_colors, list( CABLE_COLOR_YELLOW = CABLE_HEX_COLOR_YELLOW, CABLE_COLOR_BROWN = CABLE_HEX_COLOR_BROWN )) - -/* SKYRAT EDIT ADDITION BEGIN */ -#define LIGHT_COLOR_YELLOW "#E1E17D" -/* SKYRAT EDIT ADDITION END */ diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 461636b43ef..040930e5205 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -45,6 +45,7 @@ /// Armor values that are used for damage #define ARMOR_LIST_DAMAGE(...) list(BIO, BOMB, BULLET, ENERGY, LASER, MELEE, WOUND) + /// Armor values that are used for durability #define ARMOR_LIST_DURABILITY(...) list(ACID, FIRE) diff --git a/code/__DEFINES/dcs/signals/signals_object.dm b/code/__DEFINES/dcs/signals/signals_object.dm index 5bad18f9dbb..03c680c88de 100644 --- a/code/__DEFINES/dcs/signals/signals_object.dm +++ b/code/__DEFINES/dcs/signals/signals_object.dm @@ -306,10 +306,10 @@ //called in /obj/item/tank/jetpack/proc/turn_off() : () #define COMSIG_JETPACK_DEACTIVATED "jetpack_deactivated" -//called in /obj/item/organ/internal/cyberimp/chest/thrusters/proc/toggle() : () +//called in /obj/item/organ/cyberimp/chest/thrusters/proc/toggle() : () #define COMSIG_THRUSTER_ACTIVATED "jetmodule_activated" #define THRUSTER_ACTIVATION_FAILED (1<<0) -//called in /obj/item/organ/internal/cyberimp/chest/thrusters/proc/toggle() : () +//called in /obj/item/organ/cyberimp/chest/thrusters/proc/toggle() : () #define COMSIG_THRUSTER_DEACTIVATED "jetmodule_deactivated" // /obj/item/camera signals diff --git a/code/__DEFINES/exosuit_fab.dm b/code/__DEFINES/exosuit_fab.dm index 5ac95686801..706daf6e2de 100644 --- a/code/__DEFINES/exosuit_fab.dm +++ b/code/__DEFINES/exosuit_fab.dm @@ -35,8 +35,8 @@ #define EXOSUIT_MODULE_MARAUDER (1<<10) /// Module is compatible with "Working" Exosuit models - Ripley and Clarke -#define EXOSUIT_MODULE_WORKING EXOSUIT_MODULE_RIPLEY | EXOSUIT_MODULE_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_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_CONCEALED_WEP_BAY) /// Module is compatible with "Medical" Exosuit modelsm - Odysseus #define EXOSUIT_MODULE_MEDICAL EXOSUIT_MODULE_ODYSSEUS diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index cc0b51ff327..60abf7da3b7 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -150,6 +150,7 @@ #define DIGITIGRADE_OPTIONAL 1 ///The species is forced to have digitigrade legs in generation. #define DIGITIGRADE_FORCED 2 + ///Digitigrade's prefs, used in features for legs if you're meant to be a Digitigrade. #define DIGITIGRADE_LEGS "Digitigrade Legs" diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 24e14b06fa7..44d741d00f0 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -60,7 +60,7 @@ // Playtime tracking system, see jobs_exp.dm #define EXP_TYPE_LIVING "Living" #define EXP_TYPE_CREW "Crew" -#define EXP_TYPE_CENTRAL_COMMAND "Central Command" +#define EXP_TYPE_CENTRAL_COMMAND "Central Command" // SKYRAT EDIT ADD #define EXP_TYPE_COMMAND "Command" #define EXP_TYPE_ENGINEERING "Engineering" #define EXP_TYPE_MEDICAL "Medical" diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index 186d15816ea..7bee2b1040b 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -41,10 +41,6 @@ ///Amount of synthflesh required to unhusk someone #define SYNTHFLESH_UNHUSK_AMOUNT 100 -//SKYRAT EDIT ADD -///Amount of synthflesh required to unhusk someone -#define SYNTHFLESH_LING_UNHUSK_AMOUNT 200 - //used by chem masters and pill presses #define PILL_STYLE_COUNT 22 //Update this if you add more pill icons or you die #define RANDOM_PILL_STYLE 22 //Dont change this one though diff --git a/code/__DEFINES/wounds.dm b/code/__DEFINES/wounds.dm index 686b502287a..322f9a643c2 100644 --- a/code/__DEFINES/wounds.dm +++ b/code/__DEFINES/wounds.dm @@ -57,7 +57,7 @@ GLOBAL_LIST_INIT(global_wound_types, list( WOUND_SLASH = list(/datum/wound/slash/critical, /datum/wound/slash/severe, /datum/wound/slash/moderate), WOUND_PIERCE = list(/datum/wound/pierce/critical, /datum/wound/pierce/severe, /datum/wound/pierce/moderate), WOUND_BURN = list(/datum/wound/burn/critical, /datum/wound/burn/severe, /datum/wound/burn/moderate), - WOUND_MUSCLE = list(/datum/wound/muscle/severe, /datum/wound/muscle/moderate), + WOUND_MUSCLE = list(/datum/wound/muscle/severe, /datum/wound/muscle/moderate), /* SKYRAT EDIT ADD */ )) // every single type of wound that can be rolled naturally, in case you need to pull a random one @@ -74,8 +74,10 @@ GLOBAL_LIST_INIT(global_all_wound_types, list( /datum/wound/burn/critical, /datum/wound/burn/severe, /datum/wound/burn/moderate, + /* SKYRAT EDIT ADD START */ /datum/wound/muscle/severe, /datum/wound/muscle/moderate, + /* SKYRAT EDIT ADD END */ )) diff --git a/code/__DEFINES/~skyrat_defines/colors.dm b/code/__DEFINES/~skyrat_defines/colors.dm index fe35794f9f8..9c5e17b06a5 100644 --- a/code/__DEFINES/~skyrat_defines/colors.dm +++ b/code/__DEFINES/~skyrat_defines/colors.dm @@ -1,2 +1,3 @@ #define LIGHT_COLOR_CLOCKWORK "#BE8700" #define COLOR_SOLFED_GOLD "#FFD900" +#define LIGHT_COLOR_YELLOW "#E1E17D" diff --git a/code/__DEFINES/~skyrat_defines/reagents.dm b/code/__DEFINES/~skyrat_defines/reagents.dm index 981a465137c..b1bde762a54 100644 --- a/code/__DEFINES/~skyrat_defines/reagents.dm +++ b/code/__DEFINES/~skyrat_defines/reagents.dm @@ -1,2 +1,5 @@ /// This reagent is useful for blood regeneration. Useful for Hemophages. #define REAGENT_BLOOD_REGENERATING (1<<0) + +///Amount of synthflesh required to unhusk someone +#define SYNTHFLESH_LING_UNHUSK_AMOUNT 200 diff --git a/code/__HELPERS/dynamic_human_icon_gen.dm b/code/__HELPERS/dynamic_human_icon_gen.dm index a8d22ef87d7..0348524b455 100644 --- a/code/__HELPERS/dynamic_human_icon_gen.dm +++ b/code/__HELPERS/dynamic_human_icon_gen.dm @@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(dynamic_human_appearances) outfit.r_hand = r_hand if(l_hand != NO_REPLACE) outfit.l_hand = l_hand - dummy.equipOutfit(outfit) + dummy.equipOutfit(outfit, visualsOnly = TRUE) else if(mob_spawn_path) var/obj/effect/mob_spawn/spawner = new mob_spawn_path(null, TRUE) spawner.outfit_override = list() diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 85f81f23613..c82547f80f5 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -157,7 +157,7 @@ * * allow_numbers - allows numbers and common special characters - used for silicon/other weird things names * * cap_after_symbols - words like Bob's will be capitalized to Bob'S by default. False is good for titles. */ -/proc/reject_bad_name(t_in, allow_numbers = TRUE, max_length = MAX_NAME_LEN, ascii_only = TRUE, strict = FALSE, cap_after_symbols = TRUE) // SKYRAT EDIT CHANGE +/proc/reject_bad_name(t_in, allow_numbers = TRUE, max_length = MAX_NAME_LEN, ascii_only = TRUE, strict = FALSE, cap_after_symbols = TRUE) // SKYRAT EDIT CHANGE - allow_numbers to TRUE if(!t_in) return //Rejects the input if it is null