Skip to content

Commit

Permalink
Obliterates /~whitesands-defines (#2124)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## 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:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
MarkSuckerberg authored Jul 9, 2023
1 parent d22aa47 commit df77163
Show file tree
Hide file tree
Showing 32 changed files with 69 additions and 108 deletions.
5 changes: 1 addition & 4 deletions code/__DEFINES/DNA.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion code/__DEFINES/dcs/signals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
39 changes: 16 additions & 23 deletions code/__DEFINES/icon_smoothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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
4 changes: 3 additions & 1 deletion code/__DEFINES/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
13 changes: 6 additions & 7 deletions code/__DEFINES/logging.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 5 additions & 0 deletions code/__DEFINES/machines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 0 additions & 2 deletions code/__DEFINES/maps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion code/__DEFINES/maths.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
2 changes: 1 addition & 1 deletion code/__DEFINES/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/movespeed_modification.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@

//necrovirus
#define MOVESPEED_ID_NECRO_VIRUS_SLOWDOWN "NECRO_VIRUS"

#define MOVESPEED_ID_LIVING_BROKEN_BONES "LIVING_BROKEN_BONES"
3 changes: 3 additions & 0 deletions code/__DEFINES/overmap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions code/__DEFINES/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 2 additions & 3 deletions code/__DEFINES/role_preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 9 additions & 3 deletions code/__DEFINES/shuttles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion code/__DEFINES/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/status_effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 //
/////////////
Expand Down
4 changes: 4 additions & 0 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions code/__DEFINES/whitesands_after_defines/icon_smoothing.dm

This file was deleted.

7 changes: 0 additions & 7 deletions code/__DEFINES/~whitesands_defines/_defines.dm

This file was deleted.

1 change: 0 additions & 1 deletion code/__DEFINES/~whitesands_defines/atmospherics.dm

This file was deleted.

2 changes: 0 additions & 2 deletions code/__DEFINES/~whitesands_defines/jobs.dm

This file was deleted.

3 changes: 0 additions & 3 deletions code/__DEFINES/~whitesands_defines/machines.dm

This file was deleted.

1 change: 0 additions & 1 deletion code/__DEFINES/~whitesands_defines/maths.dm

This file was deleted.

This file was deleted.

11 changes: 0 additions & 11 deletions code/__DEFINES/~whitesands_defines/shuttles.dm

This file was deleted.

5 changes: 0 additions & 5 deletions code/__DEFINES/~whitesands_defines/status_effects.dm

This file was deleted.

2 changes: 0 additions & 2 deletions code/__DEFINES/~whitesands_defines/traits.dm

This file was deleted.

14 changes: 7 additions & 7 deletions code/_onclick/hud/_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
3 changes: 0 additions & 3 deletions code/modules/overmap/ships/controlled_ship_datum.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
///Name of the file used for ship name random selection
#define SHIP_NAMES_FILE "ship_names.json"

/**
* # Simulated overmap ship
*
Expand Down
12 changes: 1 addition & 11 deletions shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit df77163

Please sign in to comment.