[IDB IGNORE] [MDB IGNORE] Ending External/Internal Organ Divide: Act 1 (#797)

Author: Wollywoger

code/__DEFINES/DNA.dm

@@ -104,7 +104,6 @@
 #define ORGAN_SLOT_EXTERNAL_HORNS "horns"
 #define ORGAN_SLOT_EXTERNAL_WINGS "wings"
 #define ORGAN_SLOT_EXTERNAL_ANTENNAE "antennae"
-#define ORGAN_SLOT_EXTERNAL_BODYMARKINGS "bodymarkings"
 #define ORGAN_SLOT_EXTERNAL_POD_HAIR "pod_hair"
 #define ORGAN_SLOT_EXTERNAL_HEAD_TENTACLES "head_tentacles" // NON-MODULE CHANGE
 #define ORGAN_SLOT_EXTERNAL_SYNTH_HEAD_COVER "synth_head_cover" //NON-MODULE CHANGE

code/__DEFINES/ai/ai_blackboard.dm

@@ -6,8 +6,6 @@
 #define BB_NEXT_HUNGRY "BB_NEXT_HUNGRY"
 ///what we're going to eat next
 #define BB_FOOD_TARGET "bb_food_target"
-///Path we should use next time we use the JPS movement datum
-#define BB_PATH_TO_USE "BB_path_to_use"
 ///How close a mob must be for us to select it as a target, if that is less than how far we can maintain it as a target
 #define BB_AGGRO_RANGE "BB_aggro_range"
 ///are we hungry? determined by the udder compnent

code/__DEFINES/ai/bot_keys.dm

@@ -15,8 +15,6 @@
 #define BB_RADIO_CHANNEL "radio_channel"
 ///list of unreachable things we will temporarily ignore
 #define BB_TEMPORARY_IGNORE_LIST "temporary_ignore_list"
-///Last thing we attempted to reach
-#define BB_LAST_ATTEMPTED_PATHING "last_attempted_pathing"
 
 // medbot keys
 ///the patient we must heal

code/__DEFINES/colors.dm

@@ -52,14 +52,14 @@
 #define COLOR_ETHIOPIA_RED "#DA121A"
 #define COLOR_UNION_JACK_RED "#C8102E"
 #define COLOR_MEDIUM_DARK_RED "#CC0000"
-#define COLOR_PINK_RED "EF3340"
+#define COLOR_PINK_RED "#EF3340"
 #define COLOR_SYNDIE_RED "#F10303"
 #define COLOR_SYNDIE_RED_HEAD "#760500"
 #define COLOR_MOSTLY_PURE_RED "#FF3300"
 #define COLOR_DARK_RED "#A50824"
 #define COLOR_RED_LIGHT "#FF3333"
-#define COLOR_FIRE_LIGHT_RED "#B61C1C"
 #define COLOR_MAROON "#800000"
+#define COLOR_FIRE_LIGHT_RED "#B61C1C"
 #define COLOR_SECURITY_RED "#CB0000"
 #define COLOR_VIVID_RED "#FF3232"
 #define COLOR_LIGHT_GRAYISH_RED "#E4C7C5"

code/__DEFINES/combat.dm

@@ -241,7 +241,6 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 
 #define GRENADE_CLUMSY_FUMBLE 1
 #define GRENADE_NONCLUMSY_FUMBLE 2
-#define GRENADE_NO_FUMBLE 3
 
 #define BODY_ZONE_HEAD "head"
 #define BODY_ZONE_CHEST "chest"

code/__DEFINES/cooldowns.dm

@@ -32,7 +32,6 @@
 //Mecha cooldowns
 #define COOLDOWN_MECHA_MESSAGE "mecha_message"
 #define COOLDOWN_MECHA_EQUIPMENT(type) ("mecha_equip_[type]")
-#define COOLDOWN_MECHA_ARMOR "mecha_armor"
 #define COOLDOWN_MECHA_MELEE_ATTACK "mecha_melee"
 #define COOLDOWN_MECHA_SMOKE "mecha_smoke"
 #define COOLDOWN_MECHA_SKYFALL "mecha_skyfall"

code/__DEFINES/cult.dm

@@ -1,13 +1,12 @@
 //rune colors, for easy reference
-#define RUNE_COLOR_TALISMAN "#0000FF"
-#define RUNE_COLOR_TELEPORT "#551A8B"
-#define RUNE_COLOR_OFFER "#FFFFFF"
+#define RUNE_COLOR_TALISMAN COLOR_BLUE
+#define RUNE_COLOR_TELEPORT COLOR_DARK_PURPLE
+#define RUNE_COLOR_OFFER COLOR_WHITE
 #define RUNE_COLOR_DARKRED "#7D1717"
 #define RUNE_COLOR_MEDIUMRED "#C80000"
 #define RUNE_COLOR_BURNTORANGE "#CC5500"
-#define RUNE_COLOR_RED "#FF0000"
-#define RUNE_COLOR_EMP "#4D94FF"
-#define RUNE_COLOR_SUMMON "#00FF00"
+#define RUNE_COLOR_RED COLOR_RED
+#define RUNE_COLOR_SUMMON COLOR_VIBRANT_LIME
 
 //blood magic
 #define MAX_BLOODCHARGE 4
@@ -22,11 +21,9 @@
 #define IRON_TO_CONSTRUCT_SHELL_CONVERSION 50
 //screen locations
 #define DEFAULT_BLOODSPELLS "6:-29,4:-2"
-#define DEFAULT_BLOODTIP "14:6,14:27"
-#define DEFAULT_TOOLTIP "6:-29,5:-2"
 //misc
 #define SOULS_TO_REVIVE 3
-#define BLOODCULT_EYE "#FF0000"
+#define BLOODCULT_EYE COLOR_RED
 //soulstone & construct themes
 #define THEME_CULT "cult"
 #define THEME_WIZARD "wizard"

code/__DEFINES/diseases.dm

@@ -1,4 +1,3 @@
-
 #define DISEASE_LIMIT 1
 #define VIRUS_SYMPTOM_LIMIT 6
 

code/__DEFINES/economy.dm

@@ -63,9 +63,6 @@
 #define CIV_JOB_ATMOS 13
 #define CIV_JOB_RANDOM 14
 
-//By how much should the station's inflation value be multiplied by when dividing the civilian bounty's reward?
-#define BOUNTY_MULTIPLIER 10
-
 //These defines are to be used to with the payment component, determines which lines will be used during a transaction. If in doubt, go with clinical.
 #define PAYMENT_CLINICAL "clinical"
 #define PAYMENT_FRIENDLY "friendly"

code/__DEFINES/firealarm.dm

@@ -1,10 +1,3 @@
-//A set of defines to be sent by fire alarms. The signals are sent to the alarm's area, but are read and used by the firelocks of the area, and are used for mass changes in fire detection.
-///Sent when a fire alarm is emagged
-#define FIRE_DETECT_EMAG "fire_detect_emag"
-///Sent when the fire detection of an area is disabled
-#define FIRE_DETECT_STOP "fire_detect_stop"
-///Sent when the fire detection of an area is enabled
-#define FIRE_DETECT_START "fire_detect_start"
 ///Designates a fire lock should be closed due to HEAT
 #define FIRELOCK_ALARM_TYPE_HOT "firelock_alarm_type_hot"
 ///Designates a fire lock should be closed due to COLD