cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-09 16:05:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix define sanity linter failures (#3209)

Browse Source 
Fix all of the define sanity failures, either by adding an `#undef`
where needed or moving them to a file in `code/__DEFINES`

![image](https://github.com/user-attachments/assets/abd76dcd-d610-4567-801e-ee7fc477d58c)
This commit is contained in:
Roxy
2025-03-06 03:24:59 -05:00
committed by GitHub
parent 25b5c26807
commit 5020cec410
85 changed files with 487 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/__DEFINES/~skyrat_defines/DNA.dm
View File

@@ -143,3 +143,11 @@
// Leaving this here because it's used for bodyparts, like SPECIES_X are, but since taurs aren't a species... Named it LIMBS instead.
#define LIMBS_TAUR "taur"
#define DNA_BLOCKS_PER_FEATURE 4
#define DNA_FEATURE_COLOR_BLOCKS_PER_FEATURE 3
#define DNA_FEATURE_BLOCKS_TOTAL_SIZE_PER_FEATURE (DNA_BLOCK_SIZE + DNA_BLOCK_SIZE_COLOR * DNA_FEATURE_COLOR_BLOCKS_PER_FEATURE)
#define DNA_BLOCKS_PER_MARKING 2
#define DNA_MARKING_COLOR_BLOCKS_PER_MARKING 1
#define DNA_BLOCKS_PER_MARKING_ZONE (MAXIMUM_MARKINGS_PER_LIMB * DNA_BLOCKS_PER_MARKING + 1)
#define DNA_MARKING_BLOCKS_TOTAL_SIZE_PER_MARKING (DNA_BLOCK_SIZE + DNA_BLOCK_SIZE_COLOR * DNA_MARKING_COLOR_BLOCKS_PER_MARKING)

9
code/__DEFINES/~skyrat_defines/bsa.dm Normal file
View File

@@ -0,0 +1,9 @@
#define BSA_SYSTEM_READY "SYSTEM READY"
#define BSA_SYSTEM_PREFIRE "! SYSTEM PREFIRING !"
#define BSA_SYSTEM_FIRING "SYSTEM FIRING"
#define BSA_SYSTEM_RELOADING "SYSTEM RELOADING"
#define BSA_SYSTEM_LOW_POWER "SYSTEM POWER LOW"
#define BSA_SYSTEM_CHARGE_CAPACITORS "SYSTEM CHARGING CAPACITORS"
#define BSA_RELOAD_TIME 20 SECONDS
#define BSA_FIRE_POWER_THRESHOLD 1000000 // 1 MW

2
code/__DEFINES/~skyrat_defines/clothing.dm Normal file
View File

@@ -0,0 +1,2 @@
#define SHORTS_PANTS_SHIRTS_DIGIFILE 'modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts_digi.dmi'
#define SKIRTS_DRESSES_DIGIFILE 'modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses_digi.dmi'

1
code/__DEFINES/~skyrat_defines/colors.dm
View File

@@ -3,6 +3,7 @@
#define LIGHT_COLOR_YELLOW "#E1E17D"
#define COLOR_NRI_POLICE_BLUE "#1f3347"
#define COLOR_NRI_POLICE_SILVER "#c0c0c0"
#define SOULCATCHER_DEFAULT_COLOR "#75D5E1"
GLOBAL_LIST_INIT(chat_colors_by_mob_name, list(
"Unknown" = list("#ffffff", "#d8d8d8"),

8
code/__DEFINES/~skyrat_defines/customization.dm Normal file
View File

@@ -0,0 +1,8 @@
/// The flag to show that snouts should use the muzzled sprite.
#define SPRITE_ACCESSORY_USE_MUZZLED_SPRITE (1<<0)
/// The flag to show that this tail sprite can wag.
#define SPRITE_ACCESSORY_WAG_ABLE (1<<1)
/// The flag that controls whether or not this sprite accessory should force the wearer to hide its shoes.
#define SPRITE_ACCESSORY_HIDE_SHOES (1<<2)
/// The flag to that controls whether or not this sprite accessory should force worn facewear to use layers 5 (for glasses) and 4 (for masks and hats).
#define SPRITE_ACCESSORY_USE_ALT_FACEWEAR_LAYER (1<<3)

3
code/__DEFINES/~skyrat_defines/factions.dm
View File

@@ -18,3 +18,6 @@
// Ruin Turret faction
#define FACTION_MALF_TURRET "malf-turret"
// Decay subsystem nest faction
#define NEST_FACTION "nest spawned"

4
code/__DEFINES/~skyrat_defines/research_categories.dm
View File

@@ -1,3 +1,7 @@
#define RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_CARGO "/Cargo Cyborgs"
#define RND_CATEGORY_MECHFAB_SYNTH "/Synth"
#define RND_SUBCATEGORY_MECHFAB_SYNTH_PARTS "/Bodyparts"
#define RND_CATEGORY_NRI_FOOD "Provision"
#define RND_CATEGORY_NRI_MEDICAL "Medicine"
#define RND_CATEGORY_NRI_CLOTHING "Apparel"

4
code/__DEFINES/~~bubber_defines/bloodsucker.dm Normal file
View File

@@ -0,0 +1,4 @@
#define GHOUL_SCAN_MIN_DISTANCE 5
#define GHOUL_SCAN_MAX_DISTANCE 500
/// 2s update time.
#define GHOUL_SCAN_PING_TIME 20

72
code/__DEFINES/~~bubber_defines/guns.dm Normal file
View File

@@ -0,0 +1,72 @@
// open to suggestions on where to put these overrides
// hugely not a fan of this but we do what we gotta
/*
* gotta redefine EVERY goddamn ammo type irt to new mat costs for the ammobench's sake
* previously, SMALL_MATERIAL_AMOUNT was 100 units out of 2000 from a sheet (5%)
* so the old cost of SMALL_MATERIAL_AMOUNT * 5 was 500/2000 from a sheet (25%)
* experimental material balance PR makes it so that SMALL_MATERIAL_AMOUNT is actually 10 units out of 100 (10%)
* which made it so that the old assumed value of SMALL_MATERIAL_AMOUNT * 5 is 50/100 (50% of a sheet for a single bullet) (suboptimal)
* these updated, more consistent defines make it so that a single round's total materials should total 20% of a sheet, or 2 SMALL_MATERIAL_AMOUNT
*/
#define AMMO_MATS_BASIC list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2, \
)
#define AMMO_MATS_AP list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
/datum/material/titanium = SMALL_MATERIAL_AMOUNT * 0.4, \
)
#define AMMO_MATS_TEMP list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 0.4, \
)
#define AMMO_MATS_EMP list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
/datum/material/uranium = SMALL_MATERIAL_AMOUNT * 0.4, \
)
#define AMMO_MATS_PHASIC list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
/datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 0.4, \
)
#define AMMO_MATS_TRAC list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
/datum/material/silver = SMALL_MATERIAL_AMOUNT * 0.2, \
/datum/material/gold = SMALL_MATERIAL_AMOUNT * 0.2, \
)
#define AMMO_MATS_HOMING list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1, \
/datum/material/silver = SMALL_MATERIAL_AMOUNT * 0.2, \
/datum/material/gold = SMALL_MATERIAL_AMOUNT * 0.2, \
/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 0.2, \
/datum/material/diamond = SMALL_MATERIAL_AMOUNT * 0.2, \
/datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 0.2, \
)
// for .35 Sol Ripper
#define AMMO_MATS_RIPPER list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
/datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.4, \
)
#define AMMO_MATS_SHOTGUN list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 4) // not quite as thick as a half-sheet
#define AMMO_MATS_SHOTGUN_FLECH list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
/datum/material/glass = SMALL_MATERIAL_AMOUNT * 2)
#define AMMO_MATS_SHOTGUN_HIVE list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 1,\
/datum/material/silver = SMALL_MATERIAL_AMOUNT * 1)
#define AMMO_MATS_SHOTGUN_TIDE list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 1,\
/datum/material/gold = SMALL_MATERIAL_AMOUNT * 1)
#define AMMO_MATS_SHOTGUN_PLASMA list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 2)

8
code/__DEFINES/~~bubber_defines/loadout.dm
View File

@@ -2,3 +2,11 @@
// if item count restrictions have been significantly increased. You will end up with massively bloated save sizes otherwise.
#define LOADOUT_MAX_PRESETS 12
#define LOADOUT_MAX_NAME_LENGTH 24
#define ALL_JOBS_SEC JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC
#define ALL_JOBS_DEPT_GUARDS JOB_CORRECTIONS_OFFICER, JOB_ENGINEERING_GUARD, JOB_ORDERLY, JOB_SCIENCE_GUARD, JOB_CUSTOMS_AGENT, JOB_BOUNCER
#define ALL_JOBS_CENTRAL JOB_NT_REP, JOB_BLUESHIELD
#define ALL_JOBS_MEDICAL JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER
#define ALL_JOBS_SCIENCE JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD
#define ALL_JOBS_CARGO JOB_QUARTERMASTER, JOB_CARGO_TECHNICIAN, JOB_CUSTOMS_AGENT, JOB_SHAFT_MINER, JOB_BITRUNNER
#define ALL_JOBS_ENGINEERING JOB_CHIEF_ENGINEER, JOB_STATION_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEERING_GUARD

2
modular_skyrat/master_files/code/modules/client/preferences.dm
View File

@@ -178,3 +178,5 @@
/datum/preferences/safe_transfer_prefs_to(mob/living/carbon/human/character, icon_updates = TRUE, is_antag = FALSE, visuals_only = FALSE)
. = ..()
GLOB.chat_colors_by_mob_name[character.name] = list(character.chat_color, character.chat_color_darkened) // by now the mob has had its prefs applied to it
#undef MAX_MUTANT_ROWS

3
modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm
View File

@@ -162,3 +162,6 @@
var/language_name = params["language_name"]
preferences.languages -= name_to_language[language_name]
return TRUE
#undef MAX_LANGUAGES_NORMAL
#undef MAX_LANGUAGES_LINGUIST

3
modular_skyrat/master_files/code/modules/client/preferences_savefile.dm
View File

@@ -349,3 +349,6 @@
#undef VERSION_LANGUAGES
#undef VERSION_LOADOUT_PRESETS
#undef VERSION_INTERNAL_EXTERNAL_ORGANS
#undef INDEX_UNDERWEAR
#undef INDEX_BRA

2
modular_skyrat/master_files/code/modules/clothing/under/shorts_pants.dm
View File

@@ -1,5 +1,3 @@
#define SHORTS_PANTS_SHIRTS_DIGIFILE 'modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts_digi.dmi'
/obj/item/clothing/under/pants
worn_icon_digi = SHORTS_PANTS_SHIRTS_DIGIFILE

2
modular_skyrat/master_files/code/modules/clothing/under/skirts_dresses.dm
View File

@@ -1,5 +1,3 @@
#define SKIRTS_DRESSES_DIGIFILE 'modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses_digi.dmi'
/obj/item/clothing/under/dress
body_parts_covered = CHEST|GROIN //For reference
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY //For reference - We dont want to cut a random hole in dresses

2
modular_skyrat/master_files/code/modules/mob/living/blood.dm
View File

@@ -13,3 +13,5 @@
. = ..()
if(data && mix_data)
data[MONKEY_ORIGINS] = data[MONKEY_ORIGINS] || mix_data[MONKEY_ORIGINS]
#undef MONKEY_ORIGINS

5
modular_skyrat/modules/admin/code/localsound.dm
View File

@@ -130,3 +130,8 @@ ADMIN_VERB(play_localweb_sound, R_SOUND, "Play Local Internet Sound", "Play a gi
localweb_sound(usr, web_sound_input, range = number_input)
else
localweb_sound(usr, null, null, null)
#undef SHELLEO_ERRORLEVEL
#undef SHELLEO_STDOUT
#undef SHELLEO_STDERR
#undef COOLDOWN_LOCAL_INTERNET_SOUND

57
modular_skyrat/modules/aesthetics/guns/code/guns.dm
View File

@@ -1,60 +1,3 @@
// open to suggestions on where to put these overrides
// hugely not a fan of this but we do what we gotta
/*
* gotta redefine EVERY goddamn ammo type irt to new mat costs for the ammobench's sake
* previously, SMALL_MATERIAL_AMOUNT was 100 units out of 2000 from a sheet (5%)
* so the old cost of SMALL_MATERIAL_AMOUNT * 5 was 500/2000 from a sheet (25%)
* experimental material balance PR makes it so that SMALL_MATERIAL_AMOUNT is actually 10 units out of 100 (10%)
* which made it so that the old assumed value of SMALL_MATERIAL_AMOUNT * 5 is 50/100 (50% of a sheet for a single bullet) (suboptimal)
* these updated, more consistent defines make it so that a single round's total materials should total 20% of a sheet, or 2 SMALL_MATERIAL_AMOUNT
*/
#define AMMO_MATS_BASIC list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2, \
)
#define AMMO_MATS_AP list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
/datum/material/titanium = SMALL_MATERIAL_AMOUNT * 0.4, \
)
#define AMMO_MATS_TEMP list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 0.4, \
)
#define AMMO_MATS_EMP list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
/datum/material/uranium = SMALL_MATERIAL_AMOUNT * 0.4, \
)
#define AMMO_MATS_PHASIC list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
/datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 0.4, \
)
#define AMMO_MATS_TRAC list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
/datum/material/silver = SMALL_MATERIAL_AMOUNT * 0.2, \
/datum/material/gold = SMALL_MATERIAL_AMOUNT * 0.2, \
)
#define AMMO_MATS_HOMING list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1, \
/datum/material/silver = SMALL_MATERIAL_AMOUNT * 0.2, \
/datum/material/gold = SMALL_MATERIAL_AMOUNT * 0.2, \
/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 0.2, \
/datum/material/diamond = SMALL_MATERIAL_AMOUNT * 0.2, \
/datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 0.2, \
)
// for .35 Sol Ripper
#define AMMO_MATS_RIPPER list( \
/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
/datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.4, \
)
/obj/item/ammo_casing
custom_materials = AMMO_MATS_BASIC

3
modular_skyrat/modules/assault_operatives/code/armaments/assaultops_armament_station.dm
View File

@@ -13,9 +13,6 @@
// ARMAMENT ENTRIES
#define ARMAMENT_CATEGORY_OTHER "Miscellaneous"
#define ARMAMENT_CATEGORY_OTHER_LIMIT 3
/datum/armament_entry/assault_operatives
var/mags_to_spawn = 3

2
modular_skyrat/modules/assault_operatives/code/dynamic_rulsesets_roundstart.dm
View File

@@ -57,3 +57,5 @@
/// Returns the required goldeneye keys for activation. This is to make sure we don't have an impossible to achieve goal. However, there has to be at least one key.
/datum/dynamic_ruleset/roundstart/assault_operatives/proc/get_goldeneye_key_count()
return clamp(LAZYLEN(SSjob.get_all_heads()), 1, GOLDENEYE_REQUIRED_KEYS_MAXIMUM)
#undef ASSAULT_OPERATIVES_COUNT

4
modular_skyrat/modules/assault_operatives/code/interrogator.dm
View File

@@ -218,3 +218,7 @@
//Pick a turf to spawn at if we can
if(length(possible_turfs))
return pick(possible_turfs)
#undef STAGE_PROCESS_TIME_LOWER
#undef STAGE_PROCESS_TIME_UPPER
#undef ALERT_CREW_TIME

1
modular_skyrat/modules/assault_operatives/code/sunbeam.dm
View File

@@ -173,3 +173,4 @@
#undef SUNBEAM_MOVEMENT_COOLDOWN
#undef SUNBEAM_DEFAULT_SCALE_X
#undef SUNBEAM_DEFAULT_SCALE_Y
#undef SUNBEAM_OVERLAYS

2
modular_skyrat/modules/black_mesa/code/rationpacks.dm
View File

@@ -131,3 +131,5 @@
if(!pizza)
var/random_pizza = pick(EDIBLE_PIZZA_LIST)
pizza = new random_pizza(src)
#undef EDIBLE_PIZZA_LIST

1
modular_skyrat/modules/bongs/code/bong.dm
View File

@@ -235,6 +235,7 @@
update_alpha()
#undef MAX_FAKE_STEAM_STAGES
#undef STAGE_DOWN_TIME
/datum/crafting_recipe/bong
name = "Bong"

5
modular_skyrat/modules/borg_buffs/code/robot.dm
View File

@@ -154,3 +154,8 @@
var/obj/item/wirebrush/brush = new (cyborg.model)
cyborg.model.basic_modules += brush
cyborg.model.add_module(brush, FALSE, TRUE)
#undef BASE_SHAKER_JUICE_REAGENTS
#undef BASE_SHAKER_ALCOHOL_REAGENTS
#undef BASE_SHAKER_SODA_REAGENTS
#undef BASE_SHAKER_MISC_REAGENTS

4
modular_skyrat/modules/borgs/code/robot_items.dm
View File

@@ -881,3 +881,7 @@
new /obj/structure/reagent_water_basin(src_turf)
if("Crafting Bench")
new /obj/structure/reagent_crafting_bench(src_turf)
#undef CYBORG_FONT
#undef MAX_PAPER_INTEGRATED_CLIPBOARD
#undef BASE_NINJA_REAGENTS

9
modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm
View File

@@ -4,15 +4,6 @@
* Requires high amount of power
* Requires high level stock parts
*/
#define BSA_SYSTEM_READY "SYSTEM READY"
#define BSA_SYSTEM_PREFIRE "! SYSTEM PREFIRING !"
#define BSA_SYSTEM_FIRING "SYSTEM FIRING"
#define BSA_SYSTEM_RELOADING "SYSTEM RELOADING"
#define BSA_SYSTEM_LOW_POWER "SYSTEM POWER LOW"
#define BSA_SYSTEM_CHARGE_CAPACITORS "SYSTEM CHARGING CAPACITORS"
#define BSA_RELOAD_TIME 20 SECONDS
#define BSA_FIRE_POWER_THRESHOLD 1000000 // 1 MW
/**

5
modular_skyrat/modules/cargo/code/items/AFAD.dm
View File

@@ -9,7 +9,7 @@
inhand_icon_state = "chronogun"
w_class = WEIGHT_CLASS_NORMAL
/obj/item/gun/medbeam/afad/on_beam_tick(mob/living/target)
if(target.health != target.maxHealth)
@@ -19,3 +19,6 @@
target.adjustToxLoss(EXOTIC_DAMAGE_HEALING)
target.adjustOxyLoss(EXOTIC_DAMAGE_HEALING)
return
#undef PHYSICAL_DAMAGE_HEALING
#undef EXOTIC_DAMAGE_HEALING

2
modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm
View File

@@ -145,3 +145,5 @@
RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_CARGO
)
departmental_flags = DEPARTMENT_BITFLAG_CARGO
#undef GBP_PUNCH_REWARD

3
modular_skyrat/modules/carriers/code/carrier_component.dm
View File

@@ -1,8 +1,6 @@
///Global list containing any and all soulcatchers
GLOBAL_LIST_EMPTY(soulcatchers)
#define SOULCATCHER_DEFAULT_COLOR "#75D5E1"
#define SOULCATCHER_WARNING_MESSAGE "You have entered a soulcatcher, do not share any information you have received while a ghost. If you have died within the round, you do not know your identity until your body has been scanned, standard blackout policy also applies."
/**
* Carrier Component
@@ -405,3 +403,4 @@ GLOBAL_LIST_EMPTY(soulcatchers)
remove_mob(occupant)
return ..()

3
modular_skyrat/modules/cellguns/code/medigun_research.dm
View File

@@ -242,3 +242,6 @@
/datum/material/bluespace = SHEET_MATERIAL_AMOUNT * 3,
)
build_path = /obj/item/weaponcell/medical/utility/relocation
#undef RND_SUBCATEGORY_WEAPONS_MEDICALAMMO
#undef RND_MEDICALAMMO_UTILITY

7
modular_skyrat/modules/customization/__DEFINES/DNA.dm
View File

@@ -1,7 +0,0 @@
#define DNA_BLOCKS_PER_FEATURE 4
#define DNA_FEATURE_COLOR_BLOCKS_PER_FEATURE 3
#define DNA_FEATURE_BLOCKS_TOTAL_SIZE_PER_FEATURE (DNA_BLOCK_SIZE + DNA_BLOCK_SIZE_COLOR * DNA_FEATURE_COLOR_BLOCKS_PER_FEATURE)
#define DNA_BLOCKS_PER_MARKING 2
#define DNA_MARKING_COLOR_BLOCKS_PER_MARKING 1
#define DNA_BLOCKS_PER_MARKING_ZONE (MAXIMUM_MARKINGS_PER_LIMB * DNA_BLOCKS_PER_MARKING + 1)
#define DNA_MARKING_BLOCKS_TOTAL_SIZE_PER_MARKING (DNA_BLOCK_SIZE + DNA_BLOCK_SIZE_COLOR * DNA_MARKING_COLOR_BLOCKS_PER_MARKING)

60
modular_skyrat/modules/customization/__DEFINES/loadout.dm
View File

@@ -1,60 +0,0 @@
#define LOADOUT_POINTS_MAX 10
#define LOADOUT_POINTS_MAX_DONATOR 20
#define LOADOUT_CATEGORY_NONE "ERROR"
//Those three subcategories are good to apply to any category
#define LOADOUT_SUBCATEGORY_DONATOR "Donator"
#define LOADOUT_SUBCATEGORY_MISC "Miscellaneous"
#define LOADOUT_SUBCATEGORY_JOB "Job-related"
//In backpack
#define LOADOUT_CATEGORY_BACKPACK "In backpack"
#define LOADOUT_SUBCATEGORY_BACKPACK_TOYS "Toys"
#define LOADOUT_SUBCATEGORY_BACKPACK_FRAGRANCE "Fragrance"
#define LOADOUT_SUBCATEGORY_BACKPACK_PLUSHIES "Plushies"
//Neck
#define LOADOUT_CATEGORY_NECK "Neck"
#define LOADOUT_SUBCATEGORY_NECK_TIE "Ties"
#define LOADOUT_SUBCATEGORY_NECK_SCARVES "Scarves"
//Mask
#define LOADOUT_CATEGORY_MASK "Mask"
//In hands
#define LOADOUT_CATEGORY_HANDS "In hands"
//Uniform
#define LOADOUT_CATEGORY_UNIFORM "Uniform"
#define LOADOUT_SUBCATEGORY_UNIFORM_SUITS "Suits"
#define LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS "Skirts"
#define LOADOUT_SUBCATEGORY_UNIFORM_DRESSES "Dresses"
#define LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS "Sweaters"
#define LOADOUT_SUBCATEGORY_UNIFORM_PANTS "Pants"
#define LOADOUT_SUBCATEGORY_UNIFORM_SHORTS "Shorts"
//Suit
#define LOADOUT_CATEGORY_SUIT "Suit"
#define LOADOUT_SUBCATEGORY_SUIT_COATS "Coats"
#define LOADOUT_SUBCATEGORY_SUIT_JACKETS "Jackets"
#define LOADOUT_SUBCATEGORY_SUIT_HOODIES "Hoodies"
//Head
#define LOADOUT_CATEGORY_HEAD "Head"
//Shoes
#define LOADOUT_CATEGORY_SHOES "Shoes"
//Gloves
#define LOADOUT_CATEGORY_GLOVES "Gloves"
//Glasses
#define LOADOUT_CATEGORY_GLASSES "Glasses"
//Loadout information types, allowing a user to set more customization to them
//Doesn't store any extra information a user could set
#define LOADOUT_INFO_NONE 0
//Stores a "style", which user can set from a pre-defined list on the loadout datum
#define LOADOUT_INFO_STYLE 1
//Stores a single color for use by the loadout datum
#define LOADOUT_INFO_ONE_COLOR 2

2
modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm
View File

@@ -1924,3 +1924,5 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/korpstech, 32)
name = "implant case - 'Toaster'"
desc = "A glass case containing a toaster implant. Sweet."
imp_type = /obj/item/implant/toaster
#undef TOASTER_IMPLANT_COOLDOWN

9
modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm
View File

@@ -1,14 +1,5 @@
// GLOBAL_LIST_EMPTY(cached_mutant_icon_files)
/// The flag to show that snouts should use the muzzled sprite.
#define SPRITE_ACCESSORY_USE_MUZZLED_SPRITE (1<<0)
/// The flag to show that this tail sprite can wag.
#define SPRITE_ACCESSORY_WAG_ABLE (1<<1)
/// The flag that controls whether or not this sprite accessory should force the wearer to hide its shoes.
#define SPRITE_ACCESSORY_HIDE_SHOES (1<<2)
/// The flag to that controls whether or not this sprite accessory should force worn facewear to use layers 5 (for glasses) and 4 (for masks and hats).
#define SPRITE_ACCESSORY_USE_ALT_FACEWEAR_LAYER (1<<3)
/datum/sprite_accessory
///Unique key of an accessory. All tails should have "tail", ears "ears" etc.
var/key = null

2
modular_skyrat/modules/customization/modules/surgery/organs/spines.dm
View File

@@ -39,3 +39,5 @@
overlay.layer += SPINES_LAYER_OFFSET
return returned_overlays
#undef SPINES_LAYER_OFFSET

8
modular_skyrat/modules/decay_subsystem/code/decaySS.dm
View File

@@ -146,3 +146,11 @@ SUBSYSTEM_DEF(decay)
if(!iterating_floor.Enter(spawned_vomit))
qdel(spawned_vomit)
#undef WALL_RUST_PERCENT_CHANCE
#undef FLOOR_DIRT_PERCENT_CHANCE
#undef FLOOR_BLOOD_PERCENT_CHANCE
#undef FLOOR_VOMIT_PERCENT_CHANCE
#undef FLOOR_OIL_PERCENT_CHANCE
#undef FLOOR_TILE_MISSING_PERCENT_CHANCE
#undef FLOOR_COBWEB_PERCENT_CHANCE
#undef NEST_PERCENT_CHANCE

2
modular_skyrat/modules/decay_subsystem/code/nests.dm
View File

@@ -1,5 +1,3 @@
#define NEST_FACTION "nest spawned"
/obj/structure/mob_spawner
name = "nest"
desc = "A nasty looking pile of sticks and debris."

2
modular_skyrat/modules/deforest_medical_items/code/chemicals/twitch.dm
View File

@@ -206,6 +206,8 @@
/datum/movespeed_modifier/reagent/twitch
multiplicative_slowdown = -0.4
#undef CONSTANT_DOSE_SAFE_LIMIT
#undef TWITCH_SCREEN_FILTER
#undef TWITCH_SCREEN_BLUR

3
modular_skyrat/modules/digitigrade_cybernetics/code/mechfabricator_designs.dm
View File

@@ -52,3 +52,6 @@
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ADVANCED_DIGI
)
#undef RND_SUBCATEGORY_MECHFAB_CYBORG_DIGI
#undef RND_SUBCATEGORY_CYBERNETICS_ADVANCED_DIGI

1
modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm
View File

@@ -175,3 +175,4 @@
)
return ..()
#undef TOOL_ALIEN_BONESET

4
modular_skyrat/modules/food_replicator/code/replicator.dm
View File

@@ -1,7 +1,3 @@
#define RND_CATEGORY_NRI_FOOD "Provision"
#define RND_CATEGORY_NRI_MEDICAL "Medicine"
#define RND_CATEGORY_NRI_CLOTHING "Apparel"
/obj/machinery/biogenerator/food_replicator
name = "\improper Type 34 'Colonial Supply Core'"
desc = "The Type 34 'Colonial Supply Core,' colloquially known as the 'Gencrate/CSC' is an ancient, boxy design first put in use by the pioneer colonists of what's now known \

4
modular_skyrat/modules/food_replicator/code/replicator_designs/replicator_medical.dm
View File

@@ -107,7 +107,3 @@
RND_CATEGORY_INITIAL,
RND_CATEGORY_NRI_MEDICAL,
)
#undef RND_CATEGORY_NRI_FOOD
#undef RND_CATEGORY_NRI_MEDICAL
#undef RND_CATEGORY_NRI_CLOTHING

5
modular_skyrat/modules/goofsec/code/terragov.dm
View File

@@ -835,6 +835,11 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
else
user.balloon_alert(user, "beam-out cancelled")
#undef TERRAGOV_AMT
#undef TERRAGOV_VOTES
#undef TERRAGOV_DECLARED
#undef TERRAGOV_FINE_AMOUNT
#undef EMERGENCY_RESPONSE_POLICE
#undef EMERGENCY_RESPONSE_ATMOS
#undef EMERGENCY_RESPONSE_EMT

4
modular_skyrat/modules/hev_suit/code/hev_suit.dm
View File

@@ -860,9 +860,13 @@
#undef HEV_COOLDOWN_HEAL
#undef HEV_COOLDOWN_RADS
#undef HEV_COOLDOWN_ACID
#undef PCV_COOLDOWN_HEAL
#undef PCV_COOLDOWN_RADS
#undef PCV_COOLDOWN_ACID
#undef HEV_HEAL_AMOUNT
#undef PCV_HEAL_AMOUNT
#undef HEV_BLOOD_REPLENISHMENT
#undef PCV_BLOOD_REPLENISHMENT
#undef HEV_NOTIFICATION_TEXT_AND_VOICE
#undef HEV_NOTIFICATION_TEXT
#undef HEV_NOTIFICATION_VOICE

2
modular_skyrat/modules/implants/code/augments_brain.dm
View File

@@ -98,3 +98,5 @@
if(dead_mob.client)
var/link = FOLLOW_LINK(dead_mob, user)
to_chat(dead_mob, "[link] [rendered]")
#undef LANGUAGE_IMPLANT

2
modular_skyrat/modules/kahraman_equipment/code/ore_thumper.dm
View File

@@ -272,3 +272,5 @@
/obj/item/flatpacked_machine/ore_thumper/give_manufacturer_examine()
AddElement(/datum/element/manufacturer_examine, COMPANY_KAHRAMAN)
#undef SLAM_JAM_DELAY

5
modular_skyrat/modules/layer_shift/code/mob_movement.dm
View File

@@ -74,3 +74,8 @@
var/mob/living/layer_shifter = user
return layer_shifter.shift_layer_down()
#undef MOB_LAYER_SHIFT_INCREMENT
#undef MOB_LAYER_MULTIPLIER
#undef MOB_LAYER_SHIFT_MIN
#undef MOB_LAYER_SHIFT_MAX

4
modular_skyrat/modules/lowpop/code/lowpop_subsystem.dm
View File

@@ -1,6 +1,5 @@
#define LOWPOP_ON_MESSAGE "Due to staffing issues, we have enacted the 'critically low staff' protocol. We will periodically use our high-intensity electron beam to recharge your SMES arrays."
#define LOWPOP_OFF_MESSAGE "As the staffing issues have been resolved, we have resumed normal staffing protocol. Automatic SMES recharging will no longer occur."
#define RECHARGE_THRESHOLD 70
// A subsystem for handling lowpop affairs.
SUBSYSTEM_DEF(lowpop)
@@ -96,3 +95,6 @@ SUBSYSTEM_DEF(lowpop)
// Let's keep it running quieter
// minor_announce("All SMESs on [station_name()] have been recharged via electron beam.", "Power Systems Recharged")
#undef LOWPOP_ON_MESSAGE
#undef LOWPOP_OFF_MESSAGE

6
modular_skyrat/modules/maturity-prompt/code/maturity_subsystem.dm
View File

@@ -265,3 +265,9 @@ SUBSYSTEM_DEF(maturity_guard)
to_chat(user, player_ban_notification)
qdel(user.client)
#undef AGE_TO_PLAY
#undef AGE_CHECK_INVALID
#undef AGE_CHECK_UNDERAGE
#undef AGE_CHECK_PASSED

3
modular_skyrat/modules/medical/code/wounds/medical.dm
View File

@@ -129,3 +129,6 @@
/obj/item/stack/medical/gauze/improvised
splint_prefix = "splint_improv"
#undef SELF_AID_REMOVE_DELAY
#undef OTHER_AID_REMOVE_DELAY

3
modular_skyrat/modules/microfusion/code/microfusion_cell.dm
View File

@@ -223,6 +223,9 @@ These are basically advanced cells.
#undef MICROFUSION_CELL_DRAIN_FAILURE
#undef MICROFUSION_CELL_EMP_HEAVY_FAILURE
#undef MICROFUSION_CELL_EMP_LIGHT_FAILURE
#undef MICROFUSION_CELL_RADIATION_RANGE_FAILURE
#undef MICROFUSION_CELL_FAILURE_LOWER
#undef MICROFUSION_CELL_FAILURE_UPPER

10
modular_skyrat/modules/microfusion/code/microfusion_designs.dm
View File

@@ -429,3 +429,13 @@
/datum/material/bananium = HALF_SHEET_MATERIAL_AMOUNT,
)
build_path = /obj/item/microfusion_gun_attachment/camo/honk
#undef RND_CATEGORY_MICROFUSION_WEAPONS
#undef RND_MICROFUSION_CELLS
#undef RND_MICROFUSION_CELL_ATTACHMENTS
#undef RND_MICROFUSION_EMITTERS
#undef RND_MICROFUSION_ATTACHMENT
#undef RND_MICROFUSION_ATTACHMENT_BARREL
#undef RND_MICROFUSION_ATTACHMENT_UNDERBARREL
#undef RND_MICROFUSION_ATTACHMENT_RAIL
#undef RND_MICROFUSION_ATTACHMENT_UNIQUE

2
modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm
View File

@@ -788,3 +788,5 @@
/// Recalculates the recoil, based on attachment-provided values.
/obj/item/gun/microfusion/proc/recalculate_recoil()
recoil = max(0, attachment_recoil)
#undef DUALWIELD_PENALTY_EXTRA_MULTIPLIER

4
modular_skyrat/modules/modular_items/code/modular_glasses.dm
View File

@@ -282,3 +282,7 @@
icon_state = "projector_sci"
clothing_traits = list(TRAIT_REAGENT_SCANNER, TRAIT_RESEARCH_SCANNER)
#undef MODE_OFF
#undef MODE_OFF_FLASH_PROTECTION
#undef MODE_ON
#undef MODE_FREEZE_ANIMATION

2
modular_skyrat/modules/modular_items/code/necklace.dm
View File

@@ -40,3 +40,5 @@
to_chat(user, span_boldnotice("You feel the alien mind of the Necropolis lose its interest in you as you remove the necklace. The eye closes, and your mind does as well, losing its grasp of Ashtongue."))
//ASHWALKER TRANSLATOR NECKLACE END//
#undef LANGUAGE_TRANSLATOR

4
modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/climax.dm
View File

@@ -61,3 +61,7 @@
balls.aroused = AROUSAL_NONE
if(anus)
anus.aroused = AROUSAL_NONE
#undef AROUSAL_REMOVAL_AMOUNT
#undef STAMINA_REMOVAL_AMOUNT_EXTERNAL
#undef STAMINA_REMOVAL_AMOUNT_SELF

25
modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm
View File

@@ -1,18 +1,3 @@
#define AMMO_MATS_SHOTGUN list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 4) // not quite as thick as a half-sheet
#define AMMO_MATS_SHOTGUN_FLECH list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
/datum/material/glass = SMALL_MATERIAL_AMOUNT * 2)
#define AMMO_MATS_SHOTGUN_HIVE list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
/datum/material/silver = SMALL_MATERIAL_AMOUNT * 1)
#define AMMO_MATS_SHOTGUN_TIDE list(/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 1,\
/datum/material/titanium = SMALL_MATERIAL_AMOUNT * 1)
#define AMMO_MATS_SHOTGUN_PLASMA list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 2)
/obj/item/ammo_casing/caflechette
name = "flechette steel penetrator"
desc = "A Romfed standard rifle flechette."
@@ -137,13 +122,3 @@
var/mob/living/carbon/M = target
M.adjust_fire_stacks(12)
M.ignite_mob()
#undef AMMO_MATS_SHOTGUN
#undef AMMO_MATS_SHOTGUN_FLECH
#undef AMMO_MATS_SHOTGUN_HIVE
#undef AMMO_MATS_SHOTGUN_TIDE
#undef AMMO_MATS_SHOTGUN_PLASMA

2
modular_skyrat/modules/moretraitoritems/code/weapons.dm
View File

@@ -214,3 +214,5 @@
force = 15
block_chance = 30
armour_penetration = 5
#undef CALIBRE_14MM

4
modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm
View File

@@ -466,3 +466,7 @@
/obj/item/mounted_machine_gun_folded/Initialize(mapload)
. = ..()
AddComponent(/datum/component/deployable, deploy_time, type_to_deploy)
#undef BARREL_HEAT_THRESHOLD_LOW
#undef BARREL_HEAT_THRESHOLD_HIGH
#undef REPAIR_WELDER_COST

7
modular_skyrat/modules/mutants/code/mutant_component.dm
View File

@@ -182,3 +182,10 @@
animate(filter, alpha = 110, time = 1.5 SECONDS, loop = -1)
animate(alpha = 40, time = 2.5 SECONDS)
#undef CURE_TIME
#undef REVIVE_TIME_LOWER
#undef REVIVE_TIME_UPPER
#undef IMMUNITY_LOWER
#undef IMMUNITY_UPPER
#undef RNA_REFRESH_TIME

10
modular_skyrat/modules/novaya_ert/code/suit.dm
View File

@@ -93,3 +93,13 @@
name = "\improper VOSKHOD-IN powered combat armor"
desc = "A hybrid set of space-resistant armor built on a modified Nanotrasen heavy-duty engineering undersuit, polyurea coated lead-lined light plasteel plates hinder mobility as little as possible and offer additional radiation protection while the onboard life support system aids the user in combat. The power cell is what makes the armor work without hassle, a sticker in the power supply unit warns anyone reading to responsibly manage battery levels."
icon_state = "nri_engineer"
#undef NRI_POWERUSE_HIT
#undef NRI_POWERUSE_HEAL
#undef NRI_COOLDOWN_HEAL
#undef NRI_COOLDOWN_RADS
#undef NRI_COOLDOWN_ACID
#undef NRI_HEAL_AMOUNT
#undef NRI_BLOOD_REPLENISHMENT

5
modular_skyrat/modules/novaya_ert/code/surplus_armor.dm
View File

@@ -270,3 +270,8 @@
#undef CIN_FOREST_COLORS_COMPLIMENT
#undef CIN_MARINE_COLORS_COMPLIMENT
#undef CIN_EVIL_COLORS_COMPLIMENT
#undef HELMET_NO_ACCESSORIES
#undef HELMET_CHINSTRAP
#undef HELMET_GLASS_VISOR
#undef HELMET_BOTH_OF_THE_ABOVE

1
modular_skyrat/modules/reagent_forging/code/crafting_bench.dm
View File

@@ -387,3 +387,4 @@
return .
#undef WEAPON_COMPLETION_WOOD_AMOUNT
#undef BAD_HIT_PENALTY

2
modular_skyrat/modules/reagent_forging/code/forge_weapons.dm
View File

@@ -304,8 +304,6 @@
user.put_in_hands(converted_arrow)
qdel(src)
#define INCREASE_BLOCK_CHANGE 2
/obj/item/forging/reagent_weapon/bokken
name = "bokken"
desc = "A wooden sword that is capable of wielded in two hands. It seems to be made to prevent permanent injuries."

2
modular_skyrat/modules/salon/code/fur_dyer.dm
View File

@@ -130,3 +130,5 @@
playsound(src.loc, 'sound/effects/spray2.ogg', 50, TRUE)
#undef COLOR_MODE_SPECIFIC
#undef COLOR_MODE_GENERAL

16
modular_skyrat/modules/shotgunrebalance/code/shotgun.dm
View File

@@ -1,19 +1,3 @@
#define AMMO_MATS_SHOTGUN list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 4) // not quite as thick as a half-sheet
#define AMMO_MATS_SHOTGUN_FLECH list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
/datum/material/glass = SMALL_MATERIAL_AMOUNT * 2)
#define AMMO_MATS_SHOTGUN_HIVE list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 1,\
/datum/material/silver = SMALL_MATERIAL_AMOUNT * 1)
#define AMMO_MATS_SHOTGUN_TIDE list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 1,\
/datum/material/gold = SMALL_MATERIAL_AMOUNT * 1)
#define AMMO_MATS_SHOTGUN_PLASMA list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 2)
/obj/item/ammo_casing/shotgun
icon = 'modular_skyrat/modules/shotgunrebalance/icons/shotshells.dmi'
desc = "A 12 gauge iron slug."

3
modular_skyrat/modules/tesh_augments/code/mechfabricator_designs.dm
View File

@@ -130,3 +130,6 @@
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ADVANCED_RAPTORAL,
)
#undef RND_SUBCATEGORY_MECHFAB_CYBORG_RAPTORAL
#undef RND_SUBCATEGORY_CYBERNETICS_ADVANCED_RAPTORAL

2
modular_skyrat/modules/title_screen/code/title_screen_html.dm
View File

@@ -181,3 +181,5 @@ GLOBAL_LIST_EMPTY(startup_messages)
dat += "</body></html>"
return dat
#undef MAX_STARTUP_MESSAGES

5
modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/designs_and_tech.dm
View File

@@ -237,3 +237,8 @@
/obj/item/xenoarch/useless_relic = 1,
/obj/item/xenoarch/broken_item = 2,
)
#undef RND_SUBCATEGORY_MACHINE_XENOARCH
#undef RND_SUBCATEGORY_EQUIPMENT_XENOARCH
#undef RND_SUBCATEGORY_TOOLS_XENOARCH
#undef RND_SUBCATEGORY_TOOLS_XENOARCH_ADVANCED

2
modular_zubbers/code/game/objects/items/robot/items/hypo.dm
View File

@@ -8,3 +8,5 @@
name = "Basic Injector"
desc = "Provides basic medical assistance."
default_reagent_types = BASE_CENTCOM_REAGENTS
#undef BASE_CENTCOM_REAGENTS

4
modular_zubbers/code/modules/antagonists/bloodsucker/powers/cloak.dm
View File

@@ -1,4 +1,3 @@
#define USE_SEEN_CLOAK_LEVEL 2
#define USE_RUN_CLOAK_LEVEL 4
@@ -82,3 +81,6 @@
if(level_current < USE_RUN_CLOAK_LEVEL && was_running && user.move_intent == MOVE_INTENT_WALK)
user.toggle_move_intent()
user.balloon_alert(user, "cloak turned off.")
#undef USE_SEEN_CLOAK_LEVEL
#undef USE_RUN_CLOAK_LEVEL

2
modular_zubbers/code/modules/antagonists/bloodsucker/powers/fortitude.dm
View File

@@ -104,3 +104,5 @@
fortitude_resist = 1
UnregisterSignal(owner, list(COMSIG_LIVING_ADJUST_BRUTE_DAMAGE, COMSIG_LIVING_ADJUST_BURN_DAMAGE))
return ..()
#undef FORTITUDE_STUN_IMMUNITY_LEVEL

1
modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/dominate.dm
View File

@@ -214,3 +214,4 @@
#undef TEMP_GHOULIZE_COST
#undef DOMINATE_XRAY_LEVEL
#undef DOMINATE_NON_MUTE_GHOULIZE_LEVEL

1
modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm
View File

@@ -286,3 +286,4 @@
#undef THAUMATURGY_SHIELD_LEVEL
#undef THAUMATURGY_DOOR_BREAK_LEVEL
#undef THAUMATURGY_BLOOD_STEAL_LEVEL
#undef THAUMATURGY_EXTRA_DAMAGE_LEVEL

5
modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_datum.dm
View File

@@ -1,8 +1,3 @@
#define GHOUL_SCAN_MIN_DISTANCE 5
#define GHOUL_SCAN_MAX_DISTANCE 500
/// 2s update time.
#define GHOUL_SCAN_PING_TIME 20
/datum/antagonist/ghoul
name = "\improper Ghoul"
roundend_category = "ghouls"

4
modular_zubbers/code/modules/antagonists/modglue.dm
View File

@@ -108,3 +108,7 @@
thing.screen_loc = null
if(thing.maptext)
thing.maptext = ""
#undef PULL_SUIT
#undef IGNORE_SUIT
#undef DUMP_CONTENTS

2
modular_zubbers/code/modules/client/verbs/character_directory.dm
View File

@@ -307,3 +307,5 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
panel = typed_target.tgui
panel.holder = typed_target
panel.ui_interact(user)
#undef READ_PREFS

3
modular_zubbers/code/modules/debug_tools/physgun.dm
View File

@@ -337,3 +337,6 @@
/datum/status_effect/physgun_pause/admin
id = "physgun_pause_admin"
force = TRUE
#undef TRAIT_PHYSGUN_PAUSE
#undef PHYSGUN_EFFECTS

7
modular_zubbers/code/modules/loadout/~defines.dm
View File

@@ -1,7 +0,0 @@
#define ALL_JOBS_SEC JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC
#define ALL_JOBS_DEPT_GUARDS JOB_CORRECTIONS_OFFICER, JOB_ENGINEERING_GUARD, JOB_ORDERLY, JOB_SCIENCE_GUARD, JOB_CUSTOMS_AGENT, JOB_BOUNCER
#define ALL_JOBS_CENTRAL JOB_NT_REP, JOB_BLUESHIELD
#define ALL_JOBS_MEDICAL JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER
#define ALL_JOBS_SCIENCE JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD
#define ALL_JOBS_CARGO JOB_QUARTERMASTER, JOB_CARGO_TECHNICIAN, JOB_CUSTOMS_AGENT, JOB_SHAFT_MINER, JOB_BITRUNNER
#define ALL_JOBS_ENGINEERING JOB_CHIEF_ENGINEER, JOB_STATION_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEERING_GUARD

4
modular_zubbers/code/modules/shelves/shelf.dm
View File

@@ -233,3 +233,7 @@
var/obj/item/rack_parts/shelf/newparts = new(loc)
transfer_fingerprints_to(newparts)
qdel(src)
#undef DEFAULT_SHELF_CAPACITY
#undef DEFAULT_SHELF_USE_DELAY
#undef DEFAULT_SHELF_VERTICAL_OFFSET

162
modular_zubbers/code/modules/silicons/borgs/code/robot_defines.dm
View File

@@ -1,165 +1,3 @@
// Bubberstation custom borg sprites, add new defines in line with code\__DEFINES\~skyrat_defines\robot_defines.dm format
/************************************************************
CYBORG ICON DEFINES AND TYPES GO BELOW
*************************************************************/
//CENTCOM BORG ICON DEFINES
#define CYBORG_ICON_CENTCOM_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_cc.dmi'
#define CYBORG_ICON_CENTCOM_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_cc.dmi'
//CLOWN BORG ICON DEFINES
#define CYBORG_ICON_CLOWN_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_clown.dmi'
#define CYBORG_ICON_CLOWN_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_clown.dmi'
//MEDICAL BORG ICON DEFINES
#define CYBORG_ICON_MED_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_med.dmi'
#define CYBORG_ICON_MED_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_med.dmi'
#define CYBORG_ICON_MED_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_med.dmi'
#define CYBORG_ICON_MED_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_med.dmi'
//CARGO BORG ICON DEFINES
#define CYBORG_ICON_CARGO_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_cargo.dmi'
#define CYBORG_ICON_CARGO_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_cargo.dmi'
#define CYBORG_ICON_CARGO_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_cargo.dmi'
//SECURITY BORG ICON DEFINES
#define CYBORG_ICON_SEC_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_sec.dmi'
#define CYBORG_ICON_SEC_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_sec.dmi'
#define CYBORG_ICON_SEC_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_sec.dmi'
//ENGI BORG ICON DEFINES
#define CYBORG_ICON_ENG_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_eng.dmi'
#define CYBORG_ICON_ENG_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_eng.dmi'
#define CYBORG_ICON_ENG_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_eng.dmi'
#define CYBORG_ICON_ENG_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_eng.dmi'
//PEACEKEEPER BORG ICON DEFINES
#define CYBORG_ICON_PEACEKEEPER_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_pk.dmi'
#define CYBORG_ICON_PEACEKEEPER_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_pk.dmi'
#define CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_pk.dmi'
#define CYBORG_ICON_PEACEKEEPER_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_pk.dmi'
//SERVICE BORG ICON DEFINES
#define CYBORG_ICON_SERVICE_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_serv.dmi'
#define CYBORG_ICON_SERVICE_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_serv.dmi'
#define CYBORG_ICON_SERVICE_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_serv.dmi'
#define CYBORG_ICON_SERVICE_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_serv.dmi'
#define CYBORG_ICON_SERVICE_BUNDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_bun.dmi'
//MINING BORG ICON DEFINES
#define CYBORG_ICON_MINING_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_mine.dmi'
#define CYBORG_ICON_MINING_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_mine.dmi'
#define CYBORG_ICON_MINING_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_mine.dmi'
#define CYBORG_ICON_MINING_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_mine.dmi'
//JANI BORG ICON DEFINES
#define CYBORG_ICON_JANI_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_jani.dmi'
#define CYBORG_ICON_JANI_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_jani.dmi'
#define CYBORG_ICON_JANI_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_jani.dmi'
#define CYBORG_ICON_JANI_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_jani.dmi'
//SYNDICATE BORG ICON DEFINES
#define CYBORG_ICON_SYNDIE_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_syndie.dmi'
#define CYBORG_ICON_SYNDIE_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_syndie.dmi'
#define CYBORG_ICON_SYNDIE_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_syndie.dmi'
#define CYBORG_ICON_SYNDIE_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_syndie.dmi'
//NINJA BORG ICON DEFINES
#define CYBORG_ICON_NINJA_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_ninja.dmi'
#define CYBORG_ICON_NINJA_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_ninja.dmi'
#define CYBORG_ICON_NINJA_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_ninja.dmi'
//SCIENCE BORG ICON DEFINES
#define CYBORG_ICON_SCI_WIDE 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_sci.dmi'
#define CYBORG_ICON_SCI_TALL 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_sci.dmi'
#define CYBORG_ICON_SCI_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_sci.dmi'
#define CYBORG_ICON_SCI 'modular_zubbers/code/modules/silicons/borgs/sprites/robot_sci.dmi'
#define CYBORG_ICON_SCI_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_sci.dmi'
// RAPTOR BORG ICON TYPE DEFINE
#define CYBORG_ICON_TYPE_RAPTOR "raptor"
// SMOLRAPTOR BORG DEFINES BELOW
#define CYBORG_ICON_TYPE_SMOLRAPTOR "smolraptor"
#define CYBORG_ICON_GEN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_gen.dmi'
#define CYBORG_ICON_SCI_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_sci.dmi'
#define CYBORG_ICON_ENG_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_eng.dmi'
#define CYBORG_ICON_MED_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_med.dmi'
#define CYBORG_ICON_CAR_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_car.dmi'
#define CYBORG_ICON_SERV_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_serv.dmi'
#define CYBORG_ICON_PK_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_pk.dmi'
#define CYBORG_ICON_JANI_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_jani.dmi'
#define CYBORG_ICON_MIN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_min.dmi'
#define CYBORG_ICON_CC_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_cc.dmi'
#define CYBORG_ICON_SYN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_syndie.dmi'
#define CYBORG_ICON_NIN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_ninja.dmi'
// F3-LINE BORG DEFINES BELOW
#define CYBORG_ICON_ALL_FELI 'modular_zubbers/code/modules/silicons/borgs/sprites/felibot_all.dmi'
#define CYBORG_ICON_TYPE_GEN_FELI "FELI-Standard"
#define CYBORG_ICON_TYPE_SCI_FELI "FELI-Research"
#define CYBORG_ICON_TYPE_ENG_FELI "FELI-Engineer"
#define CYBORG_ICON_TYPE_MED_FELI "FELI-Medical"
#define CYBORG_ICON_TYPE_CAR_FELI "FELI-Cargo"
#define CYBORG_ICON_TYPE_SERV_FELI "FELI-Service"
#define CYBORG_ICON_TYPE_PK_FELI "FELI-Pk"
#define CYBORG_ICON_TYPE_JANI_FELI "FELI-Janitor"
#define CYBORG_ICON_TYPE_MINE_FELI "FELI-Mining"
#define CYBORG_ICON_TYPE_SEC_FELI "FELI-Security"
#define CYBORG_ICON_TYPE_SYNDI_FELI "FELI-Combat"
#define CYBORG_ICON_TYPE_NINJA_FELI "FELI-Ninja"
// KITTY BORG DEFINES BELOW
#define CYBORG_ICON_SCI_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_sci.dmi'
#define CYBORG_ICON_ENG_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_engi.dmi'
#define CYBORG_ICON_MED_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_medicat.dmi'
#define CYBORG_ICON_SEC_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_sec.dmi'
#define CYBORG_ICON_SERV_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_service.dmi'
#define CYBORG_ICON_JANI_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_jani.dmi'
#define CYBORG_ICON_MINE_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_mine.dmi'
// CAT BORG DEFINES BELOW
#define CYBORG_ICON_SCI_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_science.dmi'
#define CYBORG_ICON_ENG_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_engineering.dmi'
#define CYBORG_ICON_MED_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_medical.dmi'
#define CYBORG_ICON_SEC_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_security.dmi'
#define CYBORG_ICON_SERV_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_service.dmi'
#define CYBORG_ICON_MINE_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_mining.dmi'
/mob/living/silicon/robot/model/centcom
icon = CYBORG_ICON_CENTCOM_WIDE_BUBBER
icon_state = "valecc"
faction = list(ROLE_DEATHSQUAD)
req_access = list(ACCESS_CENT_GENERAL)
lawupdate = FALSE
scrambledcodes = TRUE // These are not station borgs.
ionpulse = TRUE
var/playstyle_string = "<span class='big bold'>You are a Central Command cyborg!</span><br>"
set_model = /obj/item/robot_model/centcom
cell = /obj/item/stock_parts/power_store/cell/bluespace
/mob/living/silicon/robot/model/centcom/Initialize(mapload)
laws = new /datum/ai_laws/central_override()
laws.associate(src)

181
modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm
View File

@@ -1,3 +1,165 @@
// Bubberstation custom borg sprites, add new defines in line with code\__DEFINES\~skyrat_defines\robot_defines.dm format
/************************************************************
CYBORG ICON DEFINES AND TYPES GO BELOW
*************************************************************/
//CENTCOM BORG ICON DEFINES
#define CYBORG_ICON_CENTCOM_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_cc.dmi'
#define CYBORG_ICON_CENTCOM_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_cc.dmi'
//CLOWN BORG ICON DEFINES
#define CYBORG_ICON_CLOWN_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_clown.dmi'
#define CYBORG_ICON_CLOWN_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_clown.dmi'
//MEDICAL BORG ICON DEFINES
#define CYBORG_ICON_MED_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_med.dmi'
#define CYBORG_ICON_MED_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_med.dmi'
#define CYBORG_ICON_MED_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_med.dmi'
#define CYBORG_ICON_MED_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_med.dmi'
//CARGO BORG ICON DEFINES
#define CYBORG_ICON_CARGO_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_cargo.dmi'
#define CYBORG_ICON_CARGO_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_cargo.dmi'
#define CYBORG_ICON_CARGO_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_cargo.dmi'
//SECURITY BORG ICON DEFINES
#define CYBORG_ICON_SEC_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_sec.dmi'
#define CYBORG_ICON_SEC_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_sec.dmi'
#define CYBORG_ICON_SEC_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_sec.dmi'
//ENGI BORG ICON DEFINES
#define CYBORG_ICON_ENG_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_eng.dmi'
#define CYBORG_ICON_ENG_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_eng.dmi'
#define CYBORG_ICON_ENG_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_eng.dmi'
#define CYBORG_ICON_ENG_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_eng.dmi'
//PEACEKEEPER BORG ICON DEFINES
#define CYBORG_ICON_PEACEKEEPER_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_pk.dmi'
#define CYBORG_ICON_PEACEKEEPER_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_pk.dmi'
#define CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_pk.dmi'
#define CYBORG_ICON_PEACEKEEPER_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_pk.dmi'
//SERVICE BORG ICON DEFINES
#define CYBORG_ICON_SERVICE_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_serv.dmi'
#define CYBORG_ICON_SERVICE_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_serv.dmi'
#define CYBORG_ICON_SERVICE_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_serv.dmi'
#define CYBORG_ICON_SERVICE_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_serv.dmi'
#define CYBORG_ICON_SERVICE_BUNDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_bun.dmi'
//MINING BORG ICON DEFINES
#define CYBORG_ICON_MINING_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_mine.dmi'
#define CYBORG_ICON_MINING_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_mine.dmi'
#define CYBORG_ICON_MINING_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_mine.dmi'
#define CYBORG_ICON_MINING_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_mine.dmi'
//JANI BORG ICON DEFINES
#define CYBORG_ICON_JANI_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_jani.dmi'
#define CYBORG_ICON_JANI_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_jani.dmi'
#define CYBORG_ICON_JANI_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_jani.dmi'
#define CYBORG_ICON_JANI_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_jani.dmi'
//SYNDICATE BORG ICON DEFINES
#define CYBORG_ICON_SYNDIE_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_syndie.dmi'
#define CYBORG_ICON_SYNDIE_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_syndie.dmi'
#define CYBORG_ICON_SYNDIE_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_syndie.dmi'
#define CYBORG_ICON_SYNDIE_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_syndie.dmi'
//NINJA BORG ICON DEFINES
#define CYBORG_ICON_NINJA_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_ninja.dmi'
#define CYBORG_ICON_NINJA_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_ninja.dmi'
#define CYBORG_ICON_NINJA_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_ninja.dmi'
//SCIENCE BORG ICON DEFINES
#define CYBORG_ICON_SCI_WIDE 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_sci.dmi'
#define CYBORG_ICON_SCI_TALL 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_sci.dmi'
#define CYBORG_ICON_SCI_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_sci.dmi'
#define CYBORG_ICON_SCI 'modular_zubbers/code/modules/silicons/borgs/sprites/robot_sci.dmi'
#define CYBORG_ICON_SCI_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_sci.dmi'
// RAPTOR BORG ICON TYPE DEFINE
#define CYBORG_ICON_TYPE_RAPTOR "raptor"
// SMOLRAPTOR BORG DEFINES BELOW
#define CYBORG_ICON_TYPE_SMOLRAPTOR "smolraptor"
#define CYBORG_ICON_GEN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_gen.dmi'
#define CYBORG_ICON_SCI_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_sci.dmi'
#define CYBORG_ICON_ENG_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_eng.dmi'
#define CYBORG_ICON_MED_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_med.dmi'
#define CYBORG_ICON_CAR_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_car.dmi'
#define CYBORG_ICON_SERV_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_serv.dmi'
#define CYBORG_ICON_PK_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_pk.dmi'
#define CYBORG_ICON_JANI_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_jani.dmi'
#define CYBORG_ICON_MIN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_min.dmi'
#define CYBORG_ICON_CC_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_cc.dmi'
#define CYBORG_ICON_SYN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_syndie.dmi'
#define CYBORG_ICON_NIN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_ninja.dmi'
// F3-LINE BORG DEFINES BELOW
#define CYBORG_ICON_ALL_FELI 'modular_zubbers/code/modules/silicons/borgs/sprites/felibot_all.dmi'
#define CYBORG_ICON_TYPE_GEN_FELI "FELI-Standard"
#define CYBORG_ICON_TYPE_SCI_FELI "FELI-Research"
#define CYBORG_ICON_TYPE_ENG_FELI "FELI-Engineer"
#define CYBORG_ICON_TYPE_MED_FELI "FELI-Medical"
#define CYBORG_ICON_TYPE_CAR_FELI "FELI-Cargo"
#define CYBORG_ICON_TYPE_SERV_FELI "FELI-Service"
#define CYBORG_ICON_TYPE_PK_FELI "FELI-Pk"
#define CYBORG_ICON_TYPE_JANI_FELI "FELI-Janitor"
#define CYBORG_ICON_TYPE_MINE_FELI "FELI-Mining"
#define CYBORG_ICON_TYPE_SEC_FELI "FELI-Security"
#define CYBORG_ICON_TYPE_SYNDI_FELI "FELI-Combat"
#define CYBORG_ICON_TYPE_NINJA_FELI "FELI-Ninja"
// KITTY BORG DEFINES BELOW
#define CYBORG_ICON_SCI_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_sci.dmi'
#define CYBORG_ICON_ENG_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_engi.dmi'
#define CYBORG_ICON_MED_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_medicat.dmi'
#define CYBORG_ICON_SEC_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_sec.dmi'
#define CYBORG_ICON_SERV_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_service.dmi'
#define CYBORG_ICON_JANI_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_jani.dmi'
#define CYBORG_ICON_MINE_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_mine.dmi'
// CAT BORG DEFINES BELOW
#define CYBORG_ICON_SCI_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_science.dmi'
#define CYBORG_ICON_ENG_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_engineering.dmi'
#define CYBORG_ICON_MED_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_medical.dmi'
#define CYBORG_ICON_SEC_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_security.dmi'
#define CYBORG_ICON_SERV_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_service.dmi'
#define CYBORG_ICON_MINE_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_mining.dmi'
/mob/living/silicon/robot/model/centcom
icon = CYBORG_ICON_CENTCOM_WIDE_BUBBER
icon_state = "valecc"
faction = list(ROLE_DEATHSQUAD)
req_access = list(ACCESS_CENT_GENERAL)
lawupdate = FALSE
scrambledcodes = TRUE // These are not station borgs.
ionpulse = TRUE
var/playstyle_string = "<span class='big bold'>You are a Central Command cyborg!</span><br>"
set_model = /obj/item/robot_model/centcom
cell = /obj/item/stock_parts/power_store/cell/bluespace
// The actual code to work these in
/******************************************************
@@ -1011,29 +1173,45 @@
#undef CYBORG_ICON_CENTCOM_WIDE_BUBBER
#undef CYBORG_ICON_CENTCOM_LARGE_BUBBER
#undef CYBORG_ICON_CLOWN_WIDE_BUBBER
#undef CYBORG_ICON_CLOWN_TALL_BUBBER
#undef CYBORG_ICON_MED_WIDE_BUBBER
#undef CYBORG_ICON_MED_TALL_BUBBER
#undef CYBORG_ICON_MED_LARGE_BUBBER
#undef CYBORG_ICON_CARGO_WIDE_BUBBER
#undef CYBORG_ICON_CARGO_TALL_BUBBER
#undef CYBORG_ICON_CARGO_LARGE_BUBBER
#undef CYBORG_ICON_SEC_WIDE_BUBBER
#undef CYBORG_ICON_SEC_TALL_BUBBER
#undef CYBORG_ICON_SEC_LARGE_BUBBER
#undef CYBORG_ICON_ENG_WIDE_BUBBER
#undef CYBORG_ICON_ENG_TALL_BUBBER
#undef CYBORG_ICON_ENG_LARGE_BUBBER
#undef CYBORG_ICON_PEACEKEEPER_WIDE_BUBBER
#undef CYBORG_ICON_PEACEKEEPER_TALL_BUBBER
#undef CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER
#undef CYBORG_ICON_SERVICE_WIDE_BUBBER
#undef CYBORG_ICON_SERVICE_TALL_BUBBER
#undef CYBORG_ICON_SERVICE_LARGE_BUBBER
#undef CYBORG_ICON_MINING_WIDE_BUBBER
#undef CYBORG_ICON_MINING_TALL_BUBBER
#undef CYBORG_ICON_MINING_LARGE_BUBBER
#undef CYBORG_ICON_JANI_WIDE_BUBBER
#undef CYBORG_ICON_JANI_TALL_BUBBER
#undef CYBORG_ICON_JANI_LARGE_BUBBER
#undef CYBORG_ICON_SYNDIE_WIDE_BUBBER
#undef CYBORG_ICON_SYNDIE_TALL_BUBBER
#undef CYBORG_ICON_SYNDIE_LARGE_BUBBER
#undef CYBORG_ICON_NINJA_WIDE_BUBBER
#undef CYBORG_ICON_NINJA_TALL_BUBBER
#undef CYBORG_ICON_NINJA_LARGE_BUBBER
#undef CYBORG_ICON_TYPE_RAPTOR
#undef CYBORG_ICON_SCI_WIDE
#undef CYBORG_ICON_SCI_TALL
#undef CYBORG_ICON_SCI_LARGE_BUBBER
#undef CYBORG_ICON_SCI
#undef CYBORG_ICON_SCI_HAYDEE_BUBBER
//small raptors
#undef CYBORG_ICON_TYPE_SMOLRAPTOR
#undef CYBORG_ICON_GEN_SMOLRAPTOR
@@ -1046,6 +1224,8 @@
#undef CYBORG_ICON_JANI_SMOLRAPTOR
#undef CYBORG_ICON_MIN_SMOLRAPTOR
#undef CYBORG_ICON_CC_SMOLRAPTOR
#undef CYBORG_ICON_SYN_SMOLRAPTOR
#undef CYBORG_ICON_NIN_SMOLRAPTOR
//F3-LINE
#undef CYBORG_ICON_ALL_FELI
@@ -1053,6 +1233,7 @@
#undef CYBORG_ICON_TYPE_SCI_FELI
#undef CYBORG_ICON_TYPE_ENG_FELI
#undef CYBORG_ICON_TYPE_MED_FELI
#undef CYBORG_ICON_TYPE_CAR_FELI
#undef CYBORG_ICON_TYPE_SERV_FELI
#undef CYBORG_ICON_TYPE_PK_FELI
#undef CYBORG_ICON_TYPE_JANI_FELI

2
modular_zubbers/code/modules/storyteller/gamemode.dm
View File

@@ -790,3 +790,5 @@ SUBSYSTEM_DEF(gamemode)
for(var/datum/round_event_control/event as anything in track_events)
if(event.type == text2path(type))
return event
#undef INIT_ORDER_GAMEMODE

8
tgstation.dme
View File

@@ -419,15 +419,18 @@
#include "code\__DEFINES\~skyrat_defines\banning.dm"
#include "code\__DEFINES\~skyrat_defines\barsigns.dm"
#include "code\__DEFINES\~skyrat_defines\baton_upgrades.dm"
#include "code\__DEFINES\~skyrat_defines\bsa.dm"
#include "code\__DEFINES\~skyrat_defines\cargo_import_companies.dm"
#include "code\__DEFINES\~skyrat_defines\cells.dm"
#include "code\__DEFINES\~skyrat_defines\chat.dm"
#include "code\__DEFINES\~skyrat_defines\clock_cult.dm"
#include "code\__DEFINES\~skyrat_defines\clothing.dm"
#include "code\__DEFINES\~skyrat_defines\colony_fabricator_misc.dm"
#include "code\__DEFINES\~skyrat_defines\colors.dm"
#include "code\__DEFINES\~skyrat_defines\combat.dm"
#include "code\__DEFINES\~skyrat_defines\computers.dm"
#include "code\__DEFINES\~skyrat_defines\construction.dm"
#include "code\__DEFINES\~skyrat_defines\customization.dm"
#include "code\__DEFINES\~skyrat_defines\DNA.dm"
#include "code\__DEFINES\~skyrat_defines\economy.dm"
#include "code\__DEFINES\~skyrat_defines\events.dm"
@@ -498,6 +501,7 @@
#include "code\__DEFINES\~skyrat_defines\signals\signals_human.dm"
#include "code\__DEFINES\~skyrat_defines\traits\declarations.dm"
#include "code\__DEFINES\~~bubber_defines\access.dm"
#include "code\__DEFINES\~~bubber_defines\bloodsucker.dm"
#include "code\__DEFINES\~~bubber_defines\cameranets.dm"
#include "code\__DEFINES\~~bubber_defines\changeling_zombie.dm"
#include "code\__DEFINES\~~bubber_defines\chat.dm"
@@ -506,6 +510,7 @@
#include "code\__DEFINES\~~bubber_defines\economy.dm"
#include "code\__DEFINES\~~bubber_defines\experisci.dm"
#include "code\__DEFINES\~~bubber_defines\footsteps.dm"
#include "code\__DEFINES\~~bubber_defines\guns.dm"
#include "code\__DEFINES\~~bubber_defines\item.dm"
#include "code\__DEFINES\~~bubber_defines\jobs.dm"
#include "code\__DEFINES\~~bubber_defines\loadout.dm"
@@ -7536,9 +7541,7 @@
#include "modular_skyrat\modules\cryosleep\code\mood.dm"
#include "modular_skyrat\modules\curatorbundle\Mushy.dm"
#include "modular_skyrat\modules\curatorbundle\Ronin.dm"
#include "modular_skyrat\modules\customization\__DEFINES\DNA.dm"
#include "modular_skyrat\modules\customization\__DEFINES\lists.dm"
#include "modular_skyrat\modules\customization\__DEFINES\loadout.dm"
#include "modular_skyrat\modules\customization\__HELPERS\DNA.dm"
#include "modular_skyrat\modules\customization\__HELPERS\global_lists.dm"
#include "modular_skyrat\modules\customization\__HELPERS\mobs.dm"
@@ -9209,7 +9212,6 @@
#include "modular_zubbers\code\modules\lewd_machinery\sex_barrier.dm"
#include "modular_zubbers\code\modules\limbgrowncorpses\limbgrowerblanks.dm"
#include "modular_zubbers\code\modules\liquids\height_floors.dm"
#include "modular_zubbers\code\modules\loadout\~defines.dm"
#include "modular_zubbers\code\modules\loadout\categories\accessories.dm"
#include "modular_zubbers\code\modules\loadout\categories\ears.dm"
#include "modular_zubbers\code\modules\loadout\categories\glasses.dm"