From df7716329e52cbf51657f54cb9a1bcc3fec272d2 Mon Sep 17 00:00:00 2001 From: Mark Suckerberg Date: Sun, 9 Jul 2023 12:56:45 -0500 Subject: [PATCH] Obliterates `/~whitesands-defines` (#2124) ## About The Pull Request Demodularises all of the files that WERE inside of it. ## Why It's Good For The Game It's dumb to have at this point ## Changelog :cl: /:cl: --- code/__DEFINES/DNA.dm | 5 +-- .../{~whitesands_defines => }/bone_flags.dm | 0 code/__DEFINES/dcs/signals.dm | 2 +- code/__DEFINES/icon_smoothing.dm | 39 ++++++++----------- code/__DEFINES/jobs.dm | 4 +- code/__DEFINES/logging.dm | 13 +++---- code/__DEFINES/machines.dm | 5 +++ code/__DEFINES/maps.dm | 2 - code/__DEFINES/maths.dm | 3 +- code/__DEFINES/misc.dm | 2 +- code/__DEFINES/mobs.dm | 2 +- code/__DEFINES/movespeed_modification.dm | 2 + code/__DEFINES/overmap.dm | 3 ++ code/__DEFINES/preferences.dm | 4 +- code/__DEFINES/role_preferences.dm | 5 +-- code/__DEFINES/shuttles.dm | 12 ++++-- code/__DEFINES/sound.dm | 2 +- code/__DEFINES/status_effects.dm | 2 + code/__DEFINES/traits.dm | 4 ++ .../icon_smoothing.dm | 4 -- .../__DEFINES/~whitesands_defines/_defines.dm | 7 ---- .../~whitesands_defines/atmospherics.dm | 1 - code/__DEFINES/~whitesands_defines/jobs.dm | 2 - .../__DEFINES/~whitesands_defines/machines.dm | 3 -- code/__DEFINES/~whitesands_defines/maths.dm | 1 - .../movespeed_modification.dm | 1 - .../__DEFINES/~whitesands_defines/shuttles.dm | 11 ------ .../~whitesands_defines/status_effects.dm | 5 --- code/__DEFINES/~whitesands_defines/traits.dm | 2 - code/_onclick/hud/_defines.dm | 14 +++---- .../overmap/ships/controlled_ship_datum.dm | 3 -- shiptest.dme | 12 +----- 32 files changed, 69 insertions(+), 108 deletions(-) rename code/__DEFINES/{~whitesands_defines => }/bone_flags.dm (100%) delete mode 100644 code/__DEFINES/whitesands_after_defines/icon_smoothing.dm delete mode 100644 code/__DEFINES/~whitesands_defines/_defines.dm delete mode 100644 code/__DEFINES/~whitesands_defines/atmospherics.dm delete mode 100644 code/__DEFINES/~whitesands_defines/jobs.dm delete mode 100644 code/__DEFINES/~whitesands_defines/machines.dm delete mode 100644 code/__DEFINES/~whitesands_defines/maths.dm delete mode 100644 code/__DEFINES/~whitesands_defines/movespeed_modification.dm delete mode 100644 code/__DEFINES/~whitesands_defines/shuttles.dm delete mode 100644 code/__DEFINES/~whitesands_defines/status_effects.dm delete mode 100644 code/__DEFINES/~whitesands_defines/traits.dm diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index d1263280fad0..184d691e59cf 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -55,10 +55,7 @@ #define SPIDER_WEB /datum/mutation/human/webbing #define MARTYRDOM /datum/mutation/human/martyrdom #define HARS /datum/mutation/human/headless - -// WS Edit Start - Dwarves #define DORFISM /datum/mutation/human/dorfism -// WS Edit End - Dwarves #define UI_CHANGED "ui changed" #define UE_CHANGED "ue changed" @@ -135,7 +132,7 @@ #define NOHUSK 22 // Can't be husked. #define NOMOUTH 23 #define NOSOCKS 24 // You cannot wear sock -#define NO_BONES 25 //WS Edit - Breakable Bones +#define NO_BONES 25 // You don't have bones to break //organ slots #define ORGAN_SLOT_BRAIN "brain" diff --git a/code/__DEFINES/~whitesands_defines/bone_flags.dm b/code/__DEFINES/bone_flags.dm similarity index 100% rename from code/__DEFINES/~whitesands_defines/bone_flags.dm rename to code/__DEFINES/bone_flags.dm diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index de8d485a9383..6aac7f6d7c8f 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -361,7 +361,7 @@ #define SPEECH_MESSAGE 1 // #define SPEECH_BUBBLE_TYPE 2 #define SPEECH_SPANS 3 - // #define SPEECH_SANITIZE 4 - WS edit - lizard tongues don't hiss when speaking Draconic + // #define SPEECH_SANITIZE 4 - edit - lizard tongues don't hiss when speaking Draconic #define SPEECH_LANGUAGE 5 /* #define SPEECH_IGNORE_SPAM 6 #define SPEECH_FORCED 7 */ diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index 86210c73acf6..45225714e195 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -71,16 +71,23 @@ DEFINE_BITFIELD(smoothing_flags, list( #define SMOOTH_GROUP_CARPET_STELLAR S_TURF(22) ///turf/open/floor/carpet/stellar #define SMOOTH_GROUP_CARPET_DONK S_TURF(23) ///turf/open/floor/carpet/donk #define SMOOTH_GROUP_CARPET_RED_GOLD S_TURF(24) ///turf/open/floor/carpet/red_gold +#define SMOOTH_GROUP_CARPET_NWDARK S_TURF(25) ///turf/open/floor/carpet/nanoweave +#define SMOOTH_GROUP_CARPET_NWRED S_TURF(26) ///turf/open/floor/carpet/nanoweave/red +#define SMOOTH_GROUP_CARPET_NWBLUE S_TURF(27) ///turf/open/floor/carpet/nanoweave/blue +#define SMOOTH_GROUP_CARPET_NWPURPLE S_TURF(28) ///turf/open/floor/carpet/nanoweave/purple +#define SMOOTH_GROUP_CARPET_NWORANGE S_TURF(29) ///turf/open/floor/carpet/nanoweave/orange +#define SMOOTH_GROUP_CARPET_NWBEIGE S_TURF(30) ///turf/open/floor/carpet/nanoweave/beige -#define SMOOTH_GROUP_CLOSED_TURFS S_TURF(25) ///turf/closed -#define SMOOTH_GROUP_MATERIAL_WALLS S_TURF(26) ///turf/closed/wall/material -#define SMOOTH_GROUP_SYNDICATE_WALLS S_TURF(27) ///turf/closed/wall/r_wall/syndicate -#define SMOOTH_GROUP_HOTEL_WALLS S_TURF(28) ///turf/closed/indestructible/hotelwall -#define SMOOTH_GROUP_MINERAL_WALLS S_TURF(29) ///turf/closed/mineral, /turf/closed/indestructible -#define SMOOTH_GROUP_BOSS_WALLS S_TURF(30) ///turf/closed/indestructible/riveted/boss -#define SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS S_TURF(31) ///turf/closed/wall/mineral/titanium/survival +#define SMOOTH_GROUP_CLOSED_TURFS S_TURF(31) ///turf/closed +#define SMOOTH_GROUP_MATERIAL_WALLS S_TURF(32) ///turf/closed/wall/material +#define SMOOTH_GROUP_SYNDICATE_WALLS S_TURF(33) ///turf/closed/wall/r_wall/syndicate +#define SMOOTH_GROUP_HOTEL_WALLS S_TURF(34) ///turf/closed/indestructible/hotelwall +#define SMOOTH_GROUP_MINERAL_WALLS S_TURF(35) ///turf/closed/mineral, /turf/closed/indestructible +#define SMOOTH_GROUP_BOSS_WALLS S_TURF(36) ///turf/closed/indestructible/riveted/boss +#define SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS S_TURF(37) ///turf/closed/wall/mineral/titanium/survival +#define SMOOTH_GROUP_SNOW_WALLS S_TURF(38) ///turf/closed/mineral/snow -#define MAX_S_TURF SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS //Always match this value with the one above it. +#define MAX_S_TURF SMOOTH_GROUP_SNOW_WALLS //Always match this value with the one above it. #define S_OBJ(num) (MAX_S_TURF + 1 + num) @@ -98,6 +105,7 @@ DEFINE_BITFIELD(smoothing_flags, list( #define SMOOTH_GROUP_IRON_WALLS S_OBJ(9) ///turf/closed/wall/mineral/iron, /obj/structure/falsewall/iron #define SMOOTH_GROUP_ABDUCTOR_WALLS S_OBJ(10) ///turf/closed/wall/mineral/abductor, /obj/structure/falsewall/abductor #define SMOOTH_GROUP_TITANIUM_WALLS S_OBJ(11) ///turf/closed/wall/mineral/titanium, /obj/structure/falsewall/titanium +#define SMOOTH_GROUP_TITANIUM_WALLS_EXTERIOR S_OBJ(12) ///turf/closed/wall/mineral/titanium/exterior, /obj/structure/falsewall/titanium #define SMOOTH_GROUP_PLASTITANIUM_WALLS S_OBJ(13) ///turf/closed/wall/mineral/plastitanium, /obj/structure/falsewall/plastitanium #define SMOOTH_GROUP_CONCRETE_WALLS S_OBJ(14) ///turf/closed/wall/concrete #define SMOOTH_GROUP_SURVIVAL_TIANIUM_POD S_OBJ(15) ///turf/closed/wall/mineral/titanium/survival/pod, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/reinforced/fulltile/shuttle/survival_pod @@ -138,18 +146,3 @@ DEFINE_BITFIELD(smoothing_flags, list( #define SMOOTH_GROUP_CLEANABLE_DIRT S_OBJ(67) ///obj/effect/decal/cleanable/dirt #define SMOOTH_GROUP_INDUSTRIAL_LIFT S_OBJ(70) ///obj/structure/industrial_lift - -// WS Begin: Custom WS Smoothing Groups -#define MAX_S_OBJ_NON_WS SMOOTH_GROUP_CLEANABLE_DIRT //Always match this value with the one above it. - -#define WS_S_OBJ(num) (MAX_S_OBJ_NON_WS + 1 + num) - -#define SMOOTH_GROUP_CARPET_NWDARK WS_S_OBJ(0) ///obj/item/stack/tile/carpet/nanoweave -#define SMOOTH_GROUP_CARPET_NWRED WS_S_OBJ(1) ///obj/item/stack/tile/carpet/nanoweave/red -#define SMOOTH_GROUP_CARPET_NWBLUE WS_S_OBJ(2) ///obj/item/stack/tile/carpet/nanoweave/blue -#define SMOOTH_GROUP_CARPET_NWPURPLE WS_S_OBJ(3) ///obj/item/stack/tile/carpet/nanoweave/purple -#define SMOOTH_GROUP_CARPET_NWORANGE WS_S_OBJ(4) ///obj/item/stack/tile/carpet/nanoweave/orange -#define SMOOTH_GROUP_CARPET_NWBEIGE WS_S_OBJ(5) ///obj/item/stack/tile/carpet/nanoweave/beige - -#define MAX_S_OBJ SMOOTH_GROUP_CARPET_NWBEIGE //Always match this value with the one above it. -// WS End diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 2b2a20df8e9f..c8848f000099 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -13,6 +13,7 @@ #define JOB_DISPLAY_ORDER_ASSISTANT 1 #define JOB_DISPLAY_ORDER_CAPTAIN 2 #define JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL 3 +#define JOB_DISPLAY_ORDER_SOLGOV 3.5 #define JOB_DISPLAY_ORDER_QUARTERMASTER 4 #define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 5 #define JOB_DISPLAY_ORDER_SHAFT_MINER 6 @@ -44,4 +45,5 @@ #define JOB_DISPLAY_ORDER_WARDEN 32 #define JOB_DISPLAY_ORDER_DETECTIVE 33 #define JOB_DISPLAY_ORDER_SECURITY_OFFICER 34 -#define JOB_DISPLAY_ORDER_PRISONER 35 +#define JOB_DISPLAY_ORDER_BRIG_PHYS 35 +#define JOB_DISPLAY_ORDER_PRISONER 36 diff --git a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm index 33d7aab5fc22..ebc9ab1c3bc8 100644 --- a/code/__DEFINES/logging.dm +++ b/code/__DEFINES/logging.dm @@ -39,18 +39,17 @@ #define LOG_SHUTTLE (1 << 18) #define LOG_ECON (1 << 19) #define LOG_RADIO_EMOTE (1 << 20) - -#define LOG_MSAY (1 << 25) //WS Edit -#define LOG_LOOC (1 << 26) //WS Edit -#define LOG_SUBTLER (1 << 27) //WS Edit +#define LOG_MSAY (1 << 21) +#define LOG_LOOC (1 << 22) +#define LOG_SUBTLER (1 << 23) //Individual logging panel pages #define INDIVIDUAL_ATTACK_LOG (LOG_ATTACK) #define INDIVIDUAL_SAY_LOG (LOG_SAY | LOG_WHISPER | LOG_DSAY) -#define INDIVIDUAL_EMOTE_LOG (LOG_EMOTE | LOG_SUBTLER) //WS Edit +#define INDIVIDUAL_EMOTE_LOG (LOG_EMOTE | LOG_SUBTLER) #define INDIVIDUAL_COMMS_LOG (LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS) -#define INDIVIDUAL_OOC_LOG (LOG_OOC | LOG_ADMIN | LOG_MSAY) //WS Edit - Mentors -#define INDIVIDUAL_LOOC_LOG (LOG_LOOC | LOG_ADMIN) //WS Edit +#define INDIVIDUAL_OOC_LOG (LOG_OOC | LOG_ADMIN | LOG_MSAY) +#define INDIVIDUAL_LOOC_LOG (LOG_LOOC | LOG_ADMIN) #define INDIVIDUAL_OWNERSHIP_LOG (LOG_OWNERSHIP) #define INDIVIDUAL_SHOW_ALL_LOG (LOG_ATTACK | LOG_SAY | LOG_WHISPER | LOG_EMOTE | LOG_DSAY | LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS | LOG_OOC | LOG_ADMIN | LOG_OWNERSHIP | LOG_GAME | LOG_ADMIN_PRIVATE | LOG_ASAY | LOG_MSAY | LOG_MECHA | LOG_VIRUS | LOG_CLONING | LOG_SHUTTLE | LOG_ECON | LOG_LOOC) diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 06e659329788..a89965da7bec 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -131,3 +131,8 @@ #define ORM_BOTH 0 #define ORM_INPUT 1 #define ORM_OUTPUT 2 + +#define CLONING_SUCCESS (1<<0) +#define CLONING_DELETE_RECORD (1<<1) + +#define CLICKSOUND_INTERVAL (0.1 SECONDS) //! clicky noises, how much time needed in between clicks on the machine for the sound to play on click again. diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index 243557d57477..cfde841b6a3f 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -47,7 +47,6 @@ require only minor tweaks. #define ZTRAIT_SNOWSTORM "Weather_Snowstorm" #define ZTRAIT_ASHSTORM "Weather_Ashstorm" #define ZTRAIT_ACIDRAIN "Weather_Acidrain" -#define ZTRAIT_TEMPERATURE_GRADIENT "Weather_Gradient" //WS edit - Whitesands // enum - how SSsun should calculate sun exposure on this level #define ZTRAIT_SUN_TYPE "Sun Cycle Type" @@ -93,7 +92,6 @@ require only minor tweaks. ZTRAIT_BASETURF = /turf/open/lava/smooth/lava_land_surface) #define ZTRAITS_WHITESANDS list( \ ZTRAIT_MINING = TRUE, \ - ZTRAIT_TEMPERATURE_GRADIENT = TRUE, \ ZTRAIT_SAND_RUINS = TRUE, \ ZTRAIT_BOMBCAP_MULTIPLIER = 2, \ ZTRAIT_BASETURF = /turf/open/floor/plating/asteroid/whitesands) diff --git a/code/__DEFINES/maths.dm b/code/__DEFINES/maths.dm index 35f0a32e798e..ae039936ab4c 100644 --- a/code/__DEFINES/maths.dm +++ b/code/__DEFINES/maths.dm @@ -282,4 +282,5 @@ /// Like SPT_PROB_RATE but easier to use, simply put `if(SPT_PROB(10, 5))` #define SPT_PROB(prob_per_second_percent, seconds_per_tick) (prob(100*SPT_PROB_RATE((prob_per_second_percent)/100, (seconds_per_tick)))) -// ) + +#define MAGNITUDE(a, b) (sqrt(a ** 2 + b ** 2)) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 5d8bda8b1613..3c73c0397378 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -14,7 +14,7 @@ #define GLOVES_LAYER 19 #define SHOES_LAYER 18 #define EARS_LAYER 17 -#define SPLINT_LAYER 16 //WS Edit - breakable bones +#define SPLINT_LAYER 16 #define SUIT_LAYER 15 #define GLASSES_LAYER 14 #define BELT_LAYER 13 //Possible make this an overlay of somethign required to wear a belt? diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 7368d03e319f..cb714460f622 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -351,7 +351,7 @@ #define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you #define HUNGER_FACTOR 0.1 //factor at which mob nutrition decreases -#define ETHEREAL_CHARGE_FACTOR (0.05 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) //factor at which ethereal's charge decreases //WS Edit -- Ethereal Charge Scaling +#define ETHEREAL_CHARGE_FACTOR (0.05 * ETHEREAL_CHARGE_SCALING_MULTIPLIER) //factor at which ethereal's charge decreases #define REAGENTS_METABOLISM 0.4 //How many units of reagent are consumed per tick, by default. #define REAGENTS_EFFECT_MULTIPLIER (REAGENTS_METABOLISM / 0.4) // By defining the effect multiplier this way, it'll exactly adjust all effects according to how they originally were with the 0.4 metabolism diff --git a/code/__DEFINES/movespeed_modification.dm b/code/__DEFINES/movespeed_modification.dm index a3fcfada4625..44c9598b5705 100644 --- a/code/__DEFINES/movespeed_modification.dm +++ b/code/__DEFINES/movespeed_modification.dm @@ -13,3 +13,5 @@ //necrovirus #define MOVESPEED_ID_NECRO_VIRUS_SLOWDOWN "NECRO_VIRUS" + +#define MOVESPEED_ID_LIVING_BROKEN_BONES "LIVING_BROKEN_BONES" diff --git a/code/__DEFINES/overmap.dm b/code/__DEFINES/overmap.dm index 0908f046bc23..6e49e393b8d8 100644 --- a/code/__DEFINES/overmap.dm +++ b/code/__DEFINES/overmap.dm @@ -68,6 +68,9 @@ ///Used to get the turf on the "physical" overmap representation. #define OVERMAP_TOKEN_TURF(x_pos, y_pos) locate(SSovermap.overmap_vlevel.low_x + SSovermap.overmap_vlevel.reserved_margin + x_pos - 1, SSovermap.overmap_vlevel.low_y + SSovermap.overmap_vlevel.reserved_margin + y_pos - 1, SSovermap.overmap_vlevel.z_value) +///Name of the file used for ship name random selection, if any new categories are added be sure to add them to the schema, too! +#define SHIP_NAMES_FILE "ship_names.json" + // Burn direction defines #define BURN_NONE 0 #define BURN_STOP -1 diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index a9835b3d045f..52b1dc416895 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -39,10 +39,10 @@ #define CHAT_GHOSTRADIO (1<<9) #define CHAT_BANKCARD (1<<10) #define CHAT_GHOSTLAWS (1<<11) -#define CHAT_LOOC (1<<12) //WS Edit +#define CHAT_LOOC (1<<12) #define CHAT_LOGIN_LOGOUT (1<<13) -#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_BANKCARD|CHAT_GHOSTLAWS|CHAT_LOOC|CHAT_LOGIN_LOGOUT) //WS edit +#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_BANKCARD|CHAT_GHOSTLAWS|CHAT_LOOC|CHAT_LOGIN_LOGOUT) #define PARALLAX_INSANE -1 //for show offs #define PARALLAX_HIGH 0 //default. diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm index fb4c3fd4b009..6fe70f5419b4 100644 --- a/code/__DEFINES/role_preferences.dm +++ b/code/__DEFINES/role_preferences.dm @@ -41,8 +41,7 @@ #define ROLE_FAMILIES "Familes Antagonists" #define ROLE_SYNDICATE_CYBERSUN "Cybersun Space Syndicate" //Ghost role syndi from Forgottenship ruin #define ROLE_SYNDICATE_CYBERSUN_CAPTAIN "Cybersun Space Syndicate Captain" //Forgottenship captain syndie - -#define ROLE_BORER "borer" //WS Edit - Borers +#define ROLE_BORER "borer" //Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR. //The gamemode specific ones are just so the gamemodes can query whether a player is old enough @@ -70,7 +69,7 @@ GLOBAL_LIST_INIT(special_roles, list( ROLE_SENTIENCE, ROLE_FAMILIES = /datum/game_mode/gang, ROLE_BORER -)) //WS Edit - Borers +)) //Job defines for what happens when you fail to qualify for any job during job selection #define BERANDOMJOB 1 diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm index 1829ffe2802c..bad48a364ad9 100644 --- a/code/__DEFINES/shuttles.dm +++ b/code/__DEFINES/shuttles.dm @@ -81,6 +81,12 @@ #define SHUTTLE_DEFAULT_SHUTTLE_AREA_TYPE /area/ship #define SHUTTLE_DEFAULT_UNDERLYING_AREA /area/space -//Shuttle unlocks -#define SHUTTLE_UNLOCK_BUBBLEGUM "bubblegum" -#define SHUTTLE_UNLOCK_ALIENTECH "abductor" +// max reserve shuttle dock size defines + +// neither of the shuttle's dimensions should exceed this size if it is to dock at encounters +#define RESERVE_DOCK_MAX_SIZE_LONG 56 +// only one of the shuttle's dimensions may exceed this size if it is to dock at encounters +#define RESERVE_DOCK_MAX_SIZE_SHORT 40 +// default # of tiles of padding around an autogenerated reserve shuttle dock +#define RESERVE_DOCK_DEFAULT_PADDING 3 + diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index a9ce0a05cbbe..d4d9807ec0af 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -3,7 +3,7 @@ #define CHANNEL_ADMIN 1023 #define CHANNEL_VOX 1022 #define CHANNEL_JUKEBOX 1021 -#define CHANNEL_JUKEBOX_START 1016 //The gap between this and CHANNEL_JUKEBOX determines the amount of free jukebox channels. This currently allows 6 jukebox channels to exist. WS Edit Cit #7367 +#define CHANNEL_JUKEBOX_START 1016 //The gap between this and CHANNEL_JUKEBOX determines the amount of free jukebox channels. This currently allows 6 jukebox channels to exist. #define CHANNEL_HEARTBEAT 1015 //sound channel for heartbeats #define CHANNEL_AMBIENCE 1014 #define CHANNEL_BUZZ 1013 diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index cbc3e750d10b..5fe9650c222a 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -99,6 +99,8 @@ #define STATUS_EFFECT_FAKE_VIRUS /datum/status_effect/fake_virus //gives you fluff messages for cough, sneeze, headache, etc but without an actual virus +#define STATUS_EFFECT_METAB_FROZEN /datum/status_effect/metab_frozen // Affected cannot process chems + ///////////// // NEUTRAL // ///////////// diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 642faec22885..316a1834333f 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -308,6 +308,10 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Trait granted by lipstick #define LIPSTICK_TRAIT "lipstick_trait" +// Bone breaking traits. Don't actually do anything(?) +#define TRAIT_NOBREAK "no_break" +#define TRAIT_ALLBREAK "all_break" + // common trait sources #define TRAIT_GENERIC "generic" #define GENERIC_ITEM_TRAIT "generic_item" diff --git a/code/__DEFINES/whitesands_after_defines/icon_smoothing.dm b/code/__DEFINES/whitesands_after_defines/icon_smoothing.dm deleted file mode 100644 index af098ed90f01..000000000000 --- a/code/__DEFINES/whitesands_after_defines/icon_smoothing.dm +++ /dev/null @@ -1,4 +0,0 @@ -#define S_MODULAR(num) (MAX_S_OBJ + 1 + num) ///Get a guaranteed unused number for use with modularized groups. - -#define SMOOTH_GROUP_SNOW_WALLS S_MODULAR(0) ///turf/closed/mineral/snow -#define SMOOTH_GROUP_TITANIUM_WALLS_EXTERIOR S_MODULAR(2) ///turf/closed/wall/mineral/titanium/exterior, /obj/structure/falsewall/titanium diff --git a/code/__DEFINES/~whitesands_defines/_defines.dm b/code/__DEFINES/~whitesands_defines/_defines.dm deleted file mode 100644 index 97d6f1b4f605..000000000000 --- a/code/__DEFINES/~whitesands_defines/_defines.dm +++ /dev/null @@ -1,7 +0,0 @@ -//Ghosts WS EDIT - SPAWNERS MENU -#define ui_ghost_jumptomob "SOUTH:6,CENTER-3:24" -#define ui_ghost_orbit "SOUTH:6,CENTER-2:24" -#define ui_ghost_reenter_corpse "SOUTH:6,CENTER-1:24" -#define ui_ghost_teleport "SOUTH:6,CENTER:24" -#define ui_ghost_pai "SOUTH: 6,CENTER+1:24" -#define ui_ghost_spawner_menu "SOUTH:6,CENTER+2:24" diff --git a/code/__DEFINES/~whitesands_defines/atmospherics.dm b/code/__DEFINES/~whitesands_defines/atmospherics.dm deleted file mode 100644 index 8b137891791f..000000000000 --- a/code/__DEFINES/~whitesands_defines/atmospherics.dm +++ /dev/null @@ -1 +0,0 @@ - diff --git a/code/__DEFINES/~whitesands_defines/jobs.dm b/code/__DEFINES/~whitesands_defines/jobs.dm deleted file mode 100644 index 4a5800f54027..000000000000 --- a/code/__DEFINES/~whitesands_defines/jobs.dm +++ /dev/null @@ -1,2 +0,0 @@ -#define JOB_DISPLAY_ORDER_SOLGOV 3.5 //After HoP -#define JOB_DISPLAY_ORDER_BRIG_PHYS 34.5 //After SecOfficer diff --git a/code/__DEFINES/~whitesands_defines/machines.dm b/code/__DEFINES/~whitesands_defines/machines.dm deleted file mode 100644 index 8ff585d5499d..000000000000 --- a/code/__DEFINES/~whitesands_defines/machines.dm +++ /dev/null @@ -1,3 +0,0 @@ -#define CLONING_SUCCESS (1<<0) -#define CLONING_DELETE_RECORD (1<<1) -#define CLICKSOUND_INTERVAL (0.1 SECONDS) //clicky noises, how much time needed in between clicks on the machine for the sound to play on click again. diff --git a/code/__DEFINES/~whitesands_defines/maths.dm b/code/__DEFINES/~whitesands_defines/maths.dm deleted file mode 100644 index 621847c5e422..000000000000 --- a/code/__DEFINES/~whitesands_defines/maths.dm +++ /dev/null @@ -1 +0,0 @@ -#define MAGNITUDE(a, b) (sqrt(a ** 2 + b ** 2)) diff --git a/code/__DEFINES/~whitesands_defines/movespeed_modification.dm b/code/__DEFINES/~whitesands_defines/movespeed_modification.dm deleted file mode 100644 index eadf128ff4f8..000000000000 --- a/code/__DEFINES/~whitesands_defines/movespeed_modification.dm +++ /dev/null @@ -1 +0,0 @@ -#define MOVESPEED_ID_LIVING_BROKEN_BONES "LIVING_BROKEN_BONES" //WS Edit - Breakable Bones diff --git a/code/__DEFINES/~whitesands_defines/shuttles.dm b/code/__DEFINES/~whitesands_defines/shuttles.dm deleted file mode 100644 index bacdf744ffb2..000000000000 --- a/code/__DEFINES/~whitesands_defines/shuttles.dm +++ /dev/null @@ -1,11 +0,0 @@ -//Shuttle unlocks -#define SHUTTLE_UNLOCK_EMAGGED "emagged" - -// max reserve shuttle dock size defines - -// neither of the shuttle's dimensions should exceed this size if it is to dock at encounters -#define RESERVE_DOCK_MAX_SIZE_LONG 56 -// only one of the shuttle's dimensions may exceed this size if it is to dock at encounters -#define RESERVE_DOCK_MAX_SIZE_SHORT 40 -// default # of tiles of padding around an autogenerated reserve shuttle dock -#define RESERVE_DOCK_DEFAULT_PADDING 3 diff --git a/code/__DEFINES/~whitesands_defines/status_effects.dm b/code/__DEFINES/~whitesands_defines/status_effects.dm deleted file mode 100644 index 756bcd745ea1..000000000000 --- a/code/__DEFINES/~whitesands_defines/status_effects.dm +++ /dev/null @@ -1,5 +0,0 @@ -///////////// -// DEBUFFS // -///////////// - -#define STATUS_EFFECT_METAB_FROZEN /datum/status_effect/metab_frozen // Affected cannot process chems diff --git a/code/__DEFINES/~whitesands_defines/traits.dm b/code/__DEFINES/~whitesands_defines/traits.dm deleted file mode 100644 index a046147e2595..000000000000 --- a/code/__DEFINES/~whitesands_defines/traits.dm +++ /dev/null @@ -1,2 +0,0 @@ -#define TRAIT_NOBREAK "no_break" -#define TRAIT_ALLBREAK "all_break" diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index 12b475a0f37e..8e9fde4d1859 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -160,12 +160,12 @@ #define ui_pai_take_picture "SOUTH:6,WEST+12" #define ui_pai_view_images "SOUTH:6,WEST+13" -/* Ghosts - REPLACED BY WS _defines.dm -#define ui_ghost_jumptomob "SOUTH:6,CENTER-2:24" -#define ui_ghost_orbit "SOUTH:6,CENTER-1:24" -#define ui_ghost_reenter_corpse "SOUTH:6,CENTER:24" -#define ui_ghost_teleport "SOUTH:6,CENTER+1:24" -#define ui_ghost_pai "SOUTH: 6, CENTER+2:24" -EndWS*/ +//Ghosts +#define ui_ghost_jumptomob "SOUTH:6,CENTER-3:24" +#define ui_ghost_orbit "SOUTH:6,CENTER-2:24" +#define ui_ghost_reenter_corpse "SOUTH:6,CENTER-1:24" +#define ui_ghost_teleport "SOUTH:6,CENTER:24" +#define ui_ghost_pai "SOUTH: 6,CENTER+1:24" +#define ui_ghost_spawner_menu "SOUTH:6,CENTER+2:24" #define ui_wanted_lvl "NORTH,11" diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm index 9b0ac0af3bc6..1479c3f0ceb3 100644 --- a/code/modules/overmap/ships/controlled_ship_datum.dm +++ b/code/modules/overmap/ships/controlled_ship_datum.dm @@ -1,6 +1,3 @@ -///Name of the file used for ship name random selection -#define SHIP_NAMES_FILE "ship_names.json" - /** * # Simulated overmap ship * diff --git a/shiptest.dme b/shiptest.dme index 3a622e539367..6496bbd65b03 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -33,6 +33,7 @@ #include "code\__DEFINES\bitfields.dm" #include "code\__DEFINES\blackmarket.dm" #include "code\__DEFINES\bodyparts.dm" +#include "code\__DEFINES\bone_flags.dm" #include "code\__DEFINES\botany.dm" #include "code\__DEFINES\callbacks.dm" #include "code\__DEFINES\cargo.dm" @@ -143,17 +144,6 @@ #include "code\__DEFINES\dcs\flags.dm" #include "code\__DEFINES\dcs\helpers.dm" #include "code\__DEFINES\dcs\signals.dm" -#include "code\__DEFINES\whitesands_after_defines\icon_smoothing.dm" -#include "code\__DEFINES\~whitesands_defines\_defines.dm" -#include "code\__DEFINES\~whitesands_defines\atmospherics.dm" -#include "code\__DEFINES\~whitesands_defines\bone_flags.dm" -#include "code\__DEFINES\~whitesands_defines\jobs.dm" -#include "code\__DEFINES\~whitesands_defines\machines.dm" -#include "code\__DEFINES\~whitesands_defines\maths.dm" -#include "code\__DEFINES\~whitesands_defines\movespeed_modification.dm" -#include "code\__DEFINES\~whitesands_defines\shuttles.dm" -#include "code\__DEFINES\~whitesands_defines\status_effects.dm" -#include "code\__DEFINES\~whitesands_defines\traits.dm" #include "code\__HELPERS\_extools_api.dm" #include "code\__HELPERS\_lists.dm" #include "code\__HELPERS\_logging.dm"