diff --git a/code/__defines/ammunition.dm b/code/__defines/ammunition.dm new file mode 100644 index 0000000000..001e4bb5d6 --- /dev/null +++ b/code/__defines/ammunition.dm @@ -0,0 +1,4 @@ +//Gun loading types +#define SINGLE_CASING 1 //The gun only accepts ammo_casings. ammo_magazines should never have this as their mag_type. +#define SPEEDLOADER 2 //Transfers casings from the mag to the gun when used. +#define MAGAZINE 4 //The magazine item itself goes inside the gun diff --git a/code/__defines/assemblies.dm b/code/__defines/assemblies.dm new file mode 100644 index 0000000000..898c4d9020 --- /dev/null +++ b/code/__defines/assemblies.dm @@ -0,0 +1,2 @@ +#define IC_COMPONENTS_BASE 20 +#define IC_COMPLEXITY_BASE 60 diff --git a/code/__defines/construction_datum.dm b/code/__defines/construction_datum.dm new file mode 100644 index 0000000000..7a0586d365 --- /dev/null +++ b/code/__defines/construction_datum.dm @@ -0,0 +1,2 @@ +#define FORWARD -1 +#define BACKWARD 1 diff --git a/code/__defines/economy_misc.dm b/code/__defines/economy_misc.dm new file mode 100644 index 0000000000..7059cc7aa2 --- /dev/null +++ b/code/__defines/economy_misc.dm @@ -0,0 +1,24 @@ + +#define RIOTS 1 +#define WILD_ANIMAL_ATTACK 2 +#define INDUSTRIAL_ACCIDENT 3 +#define BIOHAZARD_OUTBREAK 4 +#define PIRATES 6 +#define CORPORATE_ATTACK 7 +#define ALIEN_RAIDERS 8 +#define AI_LIBERATION 9 +#define MOURNING 10 +#define CULT_CELL_REVEALED 11 +#define SECURITY_BREACH 12 +#define ANIMAL_RIGHTS_RAID 13 +#define FESTIVAL 14 + +#define SECURITY 1 +#define FOOD 2 +#define ANIMALS 3 +#define MINERALS 4 +#define EMERGENCY 5 +#define GASEOUS 6 +#define MAINTENANCE 7 +#define ROBOTICS 8 +#define BIOMEDICAL 9 diff --git a/code/__defines/equipment_vendor.dm b/code/__defines/equipment_vendor.dm new file mode 100644 index 0000000000..85ea963834 --- /dev/null +++ b/code/__defines/equipment_vendor.dm @@ -0,0 +1,2 @@ + +#define EQUIPMENT(n, o, p) n = new /datum/data/mining_equipment(n, o, p) diff --git a/code/modules/gamemaster/defines.dm b/code/__defines/events.dm similarity index 67% rename from code/modules/gamemaster/defines.dm rename to code/__defines/events.dm index 215e07ff91..f290638dbe 100644 --- a/code/modules/gamemaster/defines.dm +++ b/code/__defines/events.dm @@ -1,3 +1,3 @@ #define EVENT_CHAOS_THRESHOLD_HIGH_IMPACT 25 #define EVENT_CHAOS_THRESHOLD_MEDIUM_IMPACT 50 -#define EVENT_CHAOS_THRESHOLD_LOW_IMPACT 100 \ No newline at end of file +#define EVENT_CHAOS_THRESHOLD_LOW_IMPACT 100 diff --git a/code/__defines/lighting_vr.dm b/code/__defines/lighting_vr.dm index aa7cb6994d..83c34affed 100644 --- a/code/__defines/lighting_vr.dm +++ b/code/__defines/lighting_vr.dm @@ -5,4 +5,9 @@ //Fake ambient occlusion filter #undef AMBIENT_OCCLUSION -#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-1, size=2, offset=2, color="#04080F55") //VOREStation Edit for prettier visuals. \ No newline at end of file +#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-1, size=2, offset=2, color="#04080F55") //VOREStation Edit for prettier visuals. + +#define LIGHT_OK 0 +#define LIGHT_EMPTY 1 +#define LIGHT_BROKEN 2 +#define LIGHT_BURNED 3 diff --git a/code/__defines/map.dm b/code/__defines/map.dm index 760110b534..66c2120250 100644 --- a/code/__defines/map.dm +++ b/code/__defines/map.dm @@ -13,3 +13,5 @@ // Misc map defines. #define SUBMAP_MAP_EDGE_PAD 8 // Automatically created submaps are forbidden from being this close to the main map's edge. //VOREStation Edit + +#define CELL_ALIVE(VAL) (VAL == cell_live_value) diff --git a/code/__defines/objects.dm b/code/__defines/objects.dm index d6530fecff..7378b766c8 100644 --- a/code/__defines/objects.dm +++ b/code/__defines/objects.dm @@ -49,3 +49,5 @@ #define MECH_ARMOR "Plating" #define MECH_GAS "Life Support" #define MECH_ELECTRIC "Firmware" + +#define DRINK_ICON_FILE 'icons/pdrink.dmi' diff --git a/code/__defines/observer.dm b/code/__defines/observer.dm new file mode 100644 index 0000000000..4a21eb68bb --- /dev/null +++ b/code/__defines/observer.dm @@ -0,0 +1 @@ +#define OBSERVER_EVENT_DESTROY "OnDestroy" diff --git a/code/__defines/organ_internal.dm b/code/__defines/organ_internal.dm new file mode 100644 index 0000000000..252097aaa3 --- /dev/null +++ b/code/__defines/organ_internal.dm @@ -0,0 +1 @@ +#define PROCESS_ACCURACY 10 diff --git a/code/__defines/power.dm b/code/__defines/power.dm new file mode 100644 index 0000000000..ea32aa1470 --- /dev/null +++ b/code/__defines/power.dm @@ -0,0 +1,2 @@ +#define I_SINGULO "singulo" +#define EMITTER_DAMAGE_POWER_TRANSFER 450 //used to transfer power to containment field generators diff --git a/code/__defines/projectile.dm b/code/__defines/projectile.dm new file mode 100644 index 0000000000..5152cd76fc --- /dev/null +++ b/code/__defines/projectile.dm @@ -0,0 +1,3 @@ +#define HOLD_CASINGS 0 //do not do anything after firing. Manual action, like pump shotguns, or guns that want to define custom behaviour +#define EJECT_CASINGS 1 //drop spent casings on the ground after firing +#define CYCLE_CASINGS 2 //experimental: cycle casings, like a revolver. Also works for multibarrelled guns diff --git a/code/__defines/recipe.dm b/code/__defines/recipe.dm new file mode 100644 index 0000000000..e0577711f4 --- /dev/null +++ b/code/__defines/recipe.dm @@ -0,0 +1,9 @@ +// Recipe type defines. Used to determine what machine makes them. +#define MICROWAVE 0x1 +#define FRYER 0x2 +#define OVEN 0x4 +#define GRILL 0x8 +#define CANDYMAKER 0x10 +#define CEREALMAKER 0x20 + +#define RECIPE_REAGENT_REPLACE 0 //Reagents in the ingredients are discarded. diff --git a/code/__defines/robot.dm b/code/__defines/robot.dm new file mode 100644 index 0000000000..30026857d7 --- /dev/null +++ b/code/__defines/robot.dm @@ -0,0 +1 @@ +#define DEFAULT_ROBOT_SPRITE_NAME "M-USE NanoTrasen" diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index 7b63084af2..3e369f1271 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -43,9 +43,9 @@ var/global/pipe_processing_killed = 0 admin_notice("Initializations complete.", R_DEBUG) // #if UNIT_TEST -// #define CHECK_SLEEP_MASTER // For unit tests we don't care about a smooth lobby screen experience. We care about speed. +// # define CHECK_SLEEP_MASTER // For unit tests we don't care about a smooth lobby screen experience. We care about speed. // #else -// #define CHECK_SLEEP_MASTER if(++initialized_objects > 500) { initialized_objects=0;sleep(world.tick_lag); } +// # define CHECK_SLEEP_MASTER if(++initialized_objects > 500) { initialized_objects=0;sleep(world.tick_lag); } // #endif /datum/controller/game_controller/proc/setup_objects() @@ -53,4 +53,4 @@ var/global/pipe_processing_killed = 0 populate_antag_type_list() //Set up spawn points. - populate_spawn_points() \ No newline at end of file + populate_spawn_points() diff --git a/code/controllers/observer_listener/atom/observer.dm b/code/controllers/observer_listener/atom/observer.dm index 8c3e93f4fc..fe56294346 100644 --- a/code/controllers/observer_listener/atom/observer.dm +++ b/code/controllers/observer_listener/atom/observer.dm @@ -1,5 +1,3 @@ -#define OBSERVER_EVENT_DESTROY "OnDestroy" - /atom var/list/observer_events diff --git a/code/controllers/subsystems/plants.dm b/code/controllers/subsystems/plants.dm index 072f261a01..42622b217d 100644 --- a/code/controllers/subsystems/plants.dm +++ b/code/controllers/subsystems/plants.dm @@ -126,7 +126,7 @@ SUBSYSTEM_DEF(plants) // Caching var/list/currentrun = src.currentrun - + while(currentrun.len) var/obj/effect/plant/P = currentrun[currentrun.len] --currentrun.len @@ -158,3 +158,5 @@ SUBSYSTEM_DEF(plants) for(var/mask in SSplants.gene_tag_masks) to_chat(usr, "[mask]: [SSplants.gene_tag_masks[mask]]") + +#undef PLANT_TICK_TIME diff --git a/code/controllers/subsystems/robot_sprites.dm b/code/controllers/subsystems/robot_sprites.dm index 8fd72b0a15..88fa331451 100644 --- a/code/controllers/subsystems/robot_sprites.dm +++ b/code/controllers/subsystems/robot_sprites.dm @@ -1,5 +1,3 @@ -#define DEFAULT_ROBOT_SPRITE_NAME "M-USE NanoTrasen" - SUBSYSTEM_DEF(robot_sprites) name = "Robot Sprites" init_order = INIT_ORDER_ROBOT_SPRITES @@ -112,4 +110,4 @@ SUBSYSTEM_DEF(robot_sprites) if(RS.whitelist_ckey == ckey && RS.whitelist_charname == spritename) . |= RS - return \ No newline at end of file + return diff --git a/code/controllers/subsystems/throwing.dm b/code/controllers/subsystems/throwing.dm index 101c71a147..0cad319b7d 100644 --- a/code/controllers/subsystems/throwing.dm +++ b/code/controllers/subsystems/throwing.dm @@ -208,3 +208,6 @@ SUBSYSTEM_DEF(throwing) if(hit_thing) finalize(hit=TRUE, t_target=hit_thing) return TRUE + +#undef MAX_THROWING_DIST +#undef MAX_TICKS_TO_MAKE_UP diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index d39d012832..453652928b 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -1,7 +1,7 @@ ///If the machine is used/deleted in the crafting process -#define CRAFTING_MACHINERY_CONSUME 1 +//# define CRAFTING_MACHINERY_CONSUME 1 Unused ///If the machine is only "used" i.e. it checks to see if it's nearby and allows crafting, but doesn't delete it -#define CRAFTING_MACHINERY_USE 0 +//# define CRAFTING_MACHINERY_USE 0 Unused /datum/crafting_recipe var/name = "" //in-game display name @@ -48,7 +48,7 @@ /datum/crafting_recipe/proc/on_craft_completion(mob/user, atom/result) return -// Computes the total reagents volume +// Computes the total reagents volume /datum/crafting_recipe/proc/get_parts_reagents_volume() . = 0 for(var/list/L in parts) diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm index be38a7a5a2..d2d3136e88 100644 --- a/code/datums/helper_datums/construction_datum.dm +++ b/code/datums/helper_datums/construction_datum.dm @@ -1,7 +1,3 @@ -#define FORWARD -1 -#define BACKWARD 1 - - // As of August 4th, 2018, these datums are only used in Mech construction. /datum/construction var/list/steps @@ -158,4 +154,4 @@ return 0 /datum/construction/reversible/custom_action(index, diff, I, user) - return 1 \ No newline at end of file + return 1 diff --git a/code/datums/looping_sounds/sequence.dm b/code/datums/looping_sounds/sequence.dm index f14b43184b..5c1a54dceb 100644 --- a/code/datums/looping_sounds/sequence.dm +++ b/code/datums/looping_sounds/sequence.dm @@ -173,3 +173,4 @@ #undef MORSE_DOT #undef MORSE_DASH +#undef MORSE_BASE_DELAY diff --git a/code/datums/wires/mines.dm b/code/datums/wires/mines.dm index 229ce682be..8fccfc1dfc 100644 --- a/code/datums/wires/mines.dm +++ b/code/datums/wires/mines.dm @@ -79,6 +79,8 @@ ..() +#undef WIRE_TRAP + /datum/wires/mines/interactable(mob/user) var/obj/effect/mine/M = holder return M.panel_open diff --git a/code/defines/procs/radio.dm b/code/defines/procs/radio.dm index 0ee38f3b12..954004b313 100644 --- a/code/defines/procs/radio.dm +++ b/code/defines/procs/radio.dm @@ -61,6 +61,11 @@ return TELECOMMS_RECEPTION_RECEIVER return TELECOMMS_RECEPTION_NONE +#undef TELECOMMS_RECEPTION_NONE +#undef TELECOMMS_RECEPTION_SENDER +#undef TELECOMMS_RECEPTION_RECEIVER +#undef TELECOMMS_RECEPTION_BOTH + /proc/get_reception(var/atom/sender, var/receiver, var/message = "", var/do_sleep = 1) var/datum/reception/reception = new diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index f188f05431..64c28a8333 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -32,12 +32,6 @@ // // The explosion cannot insta-kill anyone with 30% or more health. -#define LIGHT_OK 0 -#define LIGHT_EMPTY 1 -#define LIGHT_BROKEN 2 -#define LIGHT_BURNED 3 - - /obj/item/device/lightreplacer name = "light replacer" @@ -223,8 +217,3 @@ return 1 else return 0 - -#undef LIGHT_OK -#undef LIGHT_EMPTY -#undef LIGHT_BROKEN -#undef LIGHT_BURNED \ No newline at end of file diff --git a/code/modules/ai/ai_holder.dm b/code/modules/ai/ai_holder.dm index f8bf5cd9dc..14128dfbb1 100644 --- a/code/modules/ai/ai_holder.dm +++ b/code/modules/ai/ai_holder.dm @@ -535,3 +535,8 @@ #undef AI_NO_PROCESS #undef AI_PROCESSING #undef AI_FASTPROCESSING + +#undef START_AIPROCESSING +#undef STOP_AIPROCESSING +#undef START_AIFASTPROCESSING +#undef STOP_AIFASTPROCESSING diff --git a/code/modules/ai/ai_holder_subtypes/simple_mob_ai_vr.dm b/code/modules/ai/ai_holder_subtypes/simple_mob_ai_vr.dm index 6c78d38d8f..ef75fb502d 100644 --- a/code/modules/ai/ai_holder_subtypes/simple_mob_ai_vr.dm +++ b/code/modules/ai/ai_holder_subtypes/simple_mob_ai_vr.dm @@ -1,4 +1,6 @@ #define VIRGO_AI_NORETURN_CREATE(x) x/returnhome/returns_home=1;x/returnhome/max_home_distance=8 VIRGO_AI_NORETURN_CREATE(/datum/ai_holder/simple_mob/melee/evasive) -VIRGO_AI_NORETURN_CREATE(/datum/ai_holder/simple_mob/ranged/kiting/threatening) \ No newline at end of file +VIRGO_AI_NORETURN_CREATE(/datum/ai_holder/simple_mob/ranged/kiting/threatening) + +#undef VIRGO_AI_NORETURN_CREATE diff --git a/code/modules/busy_space_vr/air_traffic.dm b/code/modules/busy_space_vr/air_traffic.dm index 347617558e..46adabfcb2 100644 --- a/code/modules/busy_space_vr/air_traffic.dm +++ b/code/modules/busy_space_vr/air_traffic.dm @@ -460,4 +460,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller //Ship sends response to ATC msg(full_closure,"[prefix] [shipname]") return -*/ \ No newline at end of file +*/ + +#undef MIN_MSG_DELAY +#undef MAX_MSG_DELAY diff --git a/code/modules/casino/casino_prize_vendor.dm b/code/modules/casino/casino_prize_vendor.dm index df7bebcefc..10b9437d1a 100644 --- a/code/modules/casino/casino_prize_vendor.dm +++ b/code/modules/casino/casino_prize_vendor.dm @@ -350,3 +350,5 @@ /obj/machinery/casino_prize_dispenser/process() //Might not need this, but just to be safe for now if(stat & (BROKEN|NOPOWER)) return + +#undef CASINO_PRIZE diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 0a7fda4ed2..4871b3aedd 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -46,6 +46,8 @@ desc = "Replica armor commonly worn by Dominion Of Mu'tu'bi soldiers from the hit series Spacer Trail. Modified for Laser Tag (Red Team)." icon_state = "redtag2" +#undef LASER_TAG_HEALTH + /* * 80s */ diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 4c310c4a53..8bb91fdbfd 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -480,3 +480,8 @@ log transactions human_user.put_in_hands(E) E.worth = sum E.owner_name = authenticated_account.owner_name + +#undef NO_SCREEN +#undef CHANGE_SECURITY_LEVEL +#undef TRANSFER_FUNDS +#undef VIEW_TRANSACTION_LOGS diff --git a/code/modules/economy/economy_misc.dm b/code/modules/economy/economy_misc.dm index 1b029ac74a..1aa32484f5 100644 --- a/code/modules/economy/economy_misc.dm +++ b/code/modules/economy/economy_misc.dm @@ -1,29 +1,3 @@ - -#define RIOTS 1 -#define WILD_ANIMAL_ATTACK 2 -#define INDUSTRIAL_ACCIDENT 3 -#define BIOHAZARD_OUTBREAK 4 -#define PIRATES 6 -#define CORPORATE_ATTACK 7 -#define ALIEN_RAIDERS 8 -#define AI_LIBERATION 9 -#define MOURNING 10 -#define CULT_CELL_REVEALED 11 -#define SECURITY_BREACH 12 -#define ANIMAL_RIGHTS_RAID 13 -#define FESTIVAL 14 - -#define SECURITY 1 -#define FOOD 2 -#define ANIMALS 3 -#define MINERALS 4 -#define EMERGENCY 5 -#define GASEOUS 6 -#define MAINTENANCE 7 -#define ROBOTICS 8 -#define BIOMEDICAL 9 - - //---- The following corporations are friendly with NanoTrasen and loosely enable trade and travel: //Corporation NanoTrasen - Generalised / high tech research and phoron exploitation. //Corporation Vessel Contracting - Ship and station construction, materials research. diff --git a/code/modules/examine/examine.dm b/code/modules/examine/examine.dm index 9d4f8a9c0b..a97dc00bfd 100644 --- a/code/modules/examine/examine.dm +++ b/code/modules/examine/examine.dm @@ -195,3 +195,5 @@ results = list("You were unable to examine that. Tell a developer!") to_chat(src, jointext(results, "
")) update_examine_panel(B) + +#undef EXAMINE_PANEL_PADDING diff --git a/code/modules/fireworks/firework_stars.dm b/code/modules/fireworks/firework_stars.dm index 31cb9d3c59..62123a2512 100644 --- a/code/modules/fireworks/firework_stars.dm +++ b/code/modules/fireworks/firework_stars.dm @@ -145,4 +145,6 @@ if(temp_shape == "none" || !temp_shape) return "You see a [pick(firework_adjectives)] explosion of [current_color] sparks in the sky!" else - return "You see a [pick(firework_adjectives)] explosion of [current_color] sparks in the sky, forming into shape of [current_shape]!" \ No newline at end of file + return "You see a [pick(firework_adjectives)] explosion of [current_color] sparks in the sky, forming into shape of [current_shape]!" + +#undef T_FIREWORK_WEATHER_STAR diff --git a/code/modules/food/drinkingglass/drinkingglass.dm b/code/modules/food/drinkingglass/drinkingglass.dm index 1ef6ebfdcd..0b556fafc9 100644 --- a/code/modules/food/drinkingglass/drinkingglass.dm +++ b/code/modules/food/drinkingglass/drinkingglass.dm @@ -1,5 +1,3 @@ -#define DRINK_ICON_FILE 'icons/pdrink.dmi' - /var/const/DRINK_FIZZ = "fizz" /var/const/DRINK_ICE = "ice" /var/const/DRINK_ICON_DEFAULT = "" @@ -163,4 +161,4 @@ if(afterattack(target, user)) //Check to see if harm intent & splash. return else - ..() //If they're splashed, no need to do anything else. \ No newline at end of file + ..() //If they're splashed, no need to do anything else. diff --git a/code/modules/food/recipe.dm b/code/modules/food/recipe.dm index c967687e1f..fac396caf3 100644 --- a/code/modules/food/recipe.dm +++ b/code/modules/food/recipe.dm @@ -29,14 +29,6 @@ * /datum/recipe/proc/check_items(var/obj/container as obj) * * */ - -// Recipe type defines. Used to determine what machine makes them. -#define MICROWAVE 0x1 -#define FRYER 0x2 -#define OVEN 0x4 -#define GRILL 0x8 -#define CANDYMAKER 0x10 -#define CEREALMAKER 0x20 /datum/recipe var/list/reagents // Example: = list("berryjuice" = 5) // do not list same reagent twice @@ -50,8 +42,7 @@ var/result // Example: = /obj/item/weapon/reagent_containers/food/snacks/donut/normal var/result_quantity = 1 // Number of instances of result that are created. var/time = 100 // 1/10 part of second - - #define RECIPE_REAGENT_REPLACE 0 //Reagents in the ingredients are discarded. + //Only the reagents present in the result at compiletime are used #define RECIPE_REAGENT_MAX 1 //The result will contain the maximum of each reagent present between the two pools. Compiletime result, and sum of ingredients #define RECIPE_REAGENT_MIN 2 //As above, but the minimum, ignoring zero values. @@ -74,7 +65,7 @@ /datum/recipe/proc/check_reagents(var/datum/reagents/avail_reagents, var/exact = FALSE) if(!reagents || !reagents.len) return TRUE - + if(!avail_reagents) return FALSE @@ -86,7 +77,7 @@ . = FALSE else return FALSE - + if((reagents?(reagents.len):(0)) < avail_reagents.reagent_list.len) return FALSE return . @@ -117,7 +108,7 @@ /datum/recipe/proc/check_items(var/obj/container as obj, var/exact = FALSE) if(!items || !items.len) return TRUE - + . = TRUE if(items && items.len) var/list/checklist = list() @@ -332,3 +323,7 @@ /datum/recipe/proc/after_cook(obj/container) // Called When the Microwave is finished. + +#undef RECIPE_REAGENT_MAX +#undef RECIPE_REAGENT_MIN +#undef RECIPE_REAGENT_SUM diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index 224c7ee0c7..a81f2919c1 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -317,3 +317,6 @@ /obj/effect/plant/proc/is_mature() return (health >= (max_health/3) && world.time > mature_time) + +#undef DEFAULT_SEED +#undef VINE_GROWTH_STAGES diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index 8262768d3a..1ce496ba4d 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -1,6 +1,3 @@ -#define IC_COMPONENTS_BASE 20 -#define IC_COMPLEXITY_BASE 60 - // Here is where the base definition lives. // Specific subtypes are in their own folder. diff --git a/code/modules/maps/writer.dm b/code/modules/maps/writer.dm index 81c6a39603..1d4d403684 100644 --- a/code/modules/maps/writer.dm +++ b/code/modules/maps/writer.dm @@ -171,4 +171,11 @@ dmm_suite{ return key } } - } \ No newline at end of file + } + +#undef DMM_IGNORE_AREAS +#undef DMM_IGNORE_TURFS +#undef DMM_IGNORE_OBJS +#undef DMM_IGNORE_NPCS +#undef DMM_IGNORE_PLAYERS +#undef DMM_IGNORE_MOBS diff --git a/code/modules/media/mediamanager.dm b/code/modules/media/mediamanager.dm index 12fd714283..a03cfaf35d 100644 --- a/code/modules/media/mediamanager.dm +++ b/code/modules/media/mediamanager.dm @@ -179,3 +179,9 @@ targetVolume = M.volume //MP_DEBUG("Found audio source: [M.media_url] @ [(world.time - start_time) / 10]s.") push_music(targetURL, targetStartTime, targetVolume) + + +#ifdef DEBUG_MEDIAPLAYER +#undef DEBUG_MEDIAPLAYER +#undef MP_DEBUG +#endif diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index 764fbc56ae..b9e2c2d75e 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -2,8 +2,6 @@ // * n — The proper name of the purchasable // * o — The object type path of the purchasable to spawn // * p — The price of the purchasable in mining points -#define EQUIPMENT(n, o, p) n = new /datum/data/mining_equipment(n, o, p) - /**********************Mining Equipment Locker**************************/ /obj/machinery/mineral/equipment_vendor diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm index 61b6e97c8c..ade5f40adb 100644 --- a/code/modules/modular_computers/file_system/programs/command/comm.dm +++ b/code/modules/modular_computers/file_system/programs/command/comm.dm @@ -1,8 +1,3 @@ -#define STATE_DEFAULT 1 -#define STATE_MESSAGELIST 2 -#define STATE_VIEWMESSAGE 3 -#define STATE_STATUSDISPLAY 4 -#define STATE_ALERT_LEVEL 5 /datum/computer_file/program/comm filename = "comm" filedesc = "Command and Communications Program" diff --git a/code/modules/multiz/stairs.dm b/code/modules/multiz/stairs.dm index fd9702b9de..cbdbf6f43c 100644 --- a/code/modules/multiz/stairs.dm +++ b/code/modules/multiz/stairs.dm @@ -1,5 +1,3 @@ -#define STAIR_MOVE_DELAY 10 // Animation delay for non-living objects moving up/down stairs - /obj/structure/stairs name = "Stairs" desc = "Stairs leading to another deck. Not too useful if the gravity goes out." diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index 7d820c54f1..bea81b6e87 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -429,3 +429,5 @@ var/const/CE_STABLE_THRESHOLD = 0.5 B.fluorescent = 0 B.invisibility = 0 return B + +#undef BLOOD_MINIMUM_STOP_PROCESS diff --git a/code/modules/organs/internal/_organ_internal.dm b/code/modules/organs/internal/_organ_internal.dm index 58ed176505..38a5d4009b 100644 --- a/code/modules/organs/internal/_organ_internal.dm +++ b/code/modules/organs/internal/_organ_internal.dm @@ -1,5 +1,3 @@ -#define PROCESS_ACCURACY 10 - /**************************************************** INTERNAL ORGANS DEFINES ****************************************************/ @@ -61,4 +59,3 @@ if(. >= 3 && antibiotics < ANTIBIO_OD) //INFECTION_LEVEL_THREE if (prob(50)) take_damage(1,silent=prob(15)) - diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 7ca9cde39e..7fe0d25607 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -1431,3 +1431,7 @@ Note that amputating the affected organ does in fact remove the infection from t var/datum/sprite_accessory/marking/mark = markings[M]["datum"] if(mark.hide_body_parts && (organ_tag in mark.hide_body_parts)) return 1 + +#undef DROPLIMB_THRESHOLD_EDGE +#undef DROPLIMB_THRESHOLD_TEAROFF +#undef DROPLIMB_THRESHOLD_DESTROY diff --git a/code/modules/organs/organ_internal.dm b/code/modules/organs/organ_internal.dm index c67a3235d0..f4e044463d 100644 --- a/code/modules/organs/organ_internal.dm +++ b/code/modules/organs/organ_internal.dm @@ -1,5 +1,3 @@ -#define PROCESS_ACCURACY 10 - /**************************************************** INTERNAL ORGANS DEFINES ****************************************************/ diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm index c80ac3e78e..c0664319a4 100644 --- a/code/modules/planet/virgo3c_vr.dm +++ b/code/modules/planet/virgo3c_vr.dm @@ -723,3 +723,23 @@ VIRGO3C_TURF_CREATE(/turf/simulated/floor/tiled/asteroid_steel/outdoors) /turf/simulated/floor/outdoors/grass/forest/virgo3c/notrees tree_chance = 0 + +#undef VIRGO3C_ONE_ATMOSPHERE +#undef VIRGO3C_AVG_TEMP + +#undef VIRGO3C_PER_N2 +#undef VIRGO3C_PER_O2 +#undef VIRGO3C_PER_N2O +#undef VIRGO3C_PER_CO2 +#undef VIRGO3C_PER_PHORON + +#undef VIRGO3C_MOL_PER_TURF +#undef VIRGO3C_MOL_N2 +#undef VIRGO3C_MOL_O2 +#undef VIRGO3C_MOL_N2O +#undef VIRGO3C_MOL_CO2 +#undef VIRGO3C_MOL_PHORON + +#undef VIRGO3C_SET_ATMOS +#undef VIRGO3C_TURF_CREATE +#undef VIRGO3C_TURF_CREATE_UN diff --git a/code/modules/power/antimatter/computer.dm b/code/modules/power/antimatter/computer.dm index 973828b6e0..018d4d0325 100644 --- a/code/modules/power/antimatter/computer.dm +++ b/code/modules/power/antimatter/computer.dm @@ -93,3 +93,6 @@ user << browse(dat, "window=communications;size=400x500") onclose(user, "communications") +#undef STATE_DEFAULT +#undef STATE_INJECTOR +#undef STATE_ENGINE diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 7a8e6301af..4af59cedb8 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1381,6 +1381,32 @@ GLOBAL_LIST_EMPTY(apcs) /obj/machinery/power/apc/get_cell() return cell +#undef CRITICAL_APC_EMP_PROTECTION + +#undef UPDATE_CELL_IN +#undef UPDATE_OPENED1 +#undef UPDATE_OPENED2 +#undef UPDATE_MAINT +#undef UPDATE_BROKE +#undef UPDATE_BLUESCREEN +#undef UPDATE_WIREEXP +#undef UPDATE_ALLGOOD + +#undef APC_UPOVERLAY_CHARGEING0 +#undef APC_UPOVERLAY_CHARGEING1 +#undef APC_UPOVERLAY_CHARGEING2 +#undef APC_UPOVERLAY_EQUIPMENT0 +#undef APC_UPOVERLAY_EQUIPMENT1 +#undef APC_UPOVERLAY_EQUIPMENT2 +#undef APC_UPOVERLAY_LIGHTING0 +#undef APC_UPOVERLAY_LIGHTING1 +#undef APC_UPOVERLAY_LIGHTING2 +#undef APC_UPOVERLAY_ENVIRON0 +#undef APC_UPOVERLAY_ENVIRON1 +#undef APC_UPOVERLAY_ENVIRON2 +#undef APC_UPOVERLAY_LOCKED +#undef APC_UPOVERLAY_OPERATING + #undef APC_UPDATE_ICON_COOLDOWN #undef APC_EXTERNAL_POWER_NOTCONNECTED @@ -1390,3 +1416,12 @@ GLOBAL_LIST_EMPTY(apcs) #undef APC_HAS_ELECTRONICS_NONE #undef APC_HAS_ELECTRONICS_WIRED #undef APC_HAS_ELECTRONICS_SECURED + +#undef POWERCHAN_OFF +#undef POWERCHAN_OFF_AUTO +#undef POWERCHAN_ON +#undef POWERCHAN_ON_AUTO + +#undef NIGHTSHIFT_AUTO +#undef NIGHTSHIFT_NEVER +#undef NIGHTSHIFT_ALWAYS diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index dcf8dab1bd..62b162a1d9 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -319,4 +319,11 @@ update_icon() RefreshParts() update_maxcharge() - return TRUE \ No newline at end of file + return TRUE + +#undef PSU_OFFLINE +#undef PSU_OUTPUT +#undef PSU_INPUT +#undef PSU_AUTO + +#undef PSU_MAXCELLS diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 2fe1fc821b..954231a6ab 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -998,3 +998,5 @@ var/list/possible_cable_coil_colours = list( else ..() return + +#undef MAXCOIL diff --git a/code/modules/power/fusion/core/core_field.dm b/code/modules/power/fusion/core/core_field.dm index 9be55a9ce0..18d6a6834a 100644 --- a/code/modules/power/fusion/core/core_field.dm +++ b/code/modules/power/fusion/core/core_field.dm @@ -325,7 +325,7 @@ var/obj/S = new Mat.stack_type dormant_reactant_quantities[particle] -= 20 S.throw_at_random(FALSE, 7, 3) - + else dormant_reactant_quantities[particle] = 0 @@ -684,5 +684,6 @@ return #undef FUSION_HEAT_CAP +#undef FUSION_ENERGY_PER_K #undef FUSION_MAX_ENVIRO_HEAT #undef PLASMA_TEMP_RADIATION_DIVISIOR diff --git a/code/modules/power/fusion/magpower.dm b/code/modules/power/fusion/magpower.dm index 81ab2e5ce5..9d5f9bb649 100644 --- a/code/modules/power/fusion/magpower.dm +++ b/code/modules/power/fusion/magpower.dm @@ -71,3 +71,6 @@ if (FF.plasma_temperature <= MINIMUM_PLASMA_TEMPERATURE) icon_state = "mag_trap0" return + +#undef ENERGY_PER_K +#undef MINIMUM_PLASMA_TEMPERATURE diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index e9b0ebb9b5..2159054ff2 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -4,10 +4,6 @@ // status values shared between lighting fixtures and items -#define LIGHT_OK 0 -#define LIGHT_EMPTY 1 -#define LIGHT_BROKEN 2 -#define LIGHT_BURNED 3 #define LIGHT_BULB_TEMPERATURE 400 //K - used value for a 60W bulb #define LIGHTING_POWER_FACTOR 2 //5W per luminosity * range //VOREStation Edit: why the fuck are lights eating so much power, 2W per thing #define LIGHT_EMERGENCY_POWER_USE 0.2 //How much power emergency lights will consume per tick @@ -1179,3 +1175,7 @@ var/global/list/light_type_cache = list() icon = 'icons/obj/lighting.dmi' icon_state = "lampshade" w_class = ITEMSIZE_TINY + +#undef LIGHT_BULB_TEMPERATURE +#undef LIGHTING_POWER_FACTOR +#undef LIGHT_EMERGENCY_POWER_USE diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index d4fbd73a41..17896de426 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -417,3 +417,7 @@ //no special effects, but the explosion is pretty big (same as a supermatter shard). explosion(src.loc, 3, 6, 12, 16, 1) qdel(src) + + +#undef TEMPERATURE_DIVISOR +#undef TEMPERATURE_CHANGE_MAX diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm index 4d92e37c4e..51c53138fa 100644 --- a/code/modules/power/singularity/act.dm +++ b/code/modules/power/singularity/act.dm @@ -1,5 +1,3 @@ -#define I_SINGULO "singulo" - /atom/proc/singularity_act() return diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index e14b59f09b..85b10c8b00 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -1,5 +1,3 @@ -#define EMITTER_DAMAGE_POWER_TRANSFER 450 //used to transfer power to containment field generators - /obj/machinery/power/emitter name = "emitter" desc = "It is a heavy duty industrial laser." diff --git a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm index af901342d5..b0ced621a2 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm @@ -416,4 +416,7 @@ required_atmos_temp_min = 400 required_atmos_temp_max = 20000 - probability = 20 \ No newline at end of file + probability = 20 + +#undef PS_RESULT_STACK +#undef PS_RESULT_ITEM diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index cc8ed45f3b..a64f2c7861 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -3,8 +3,8 @@ GLOBAL_LIST_EMPTY(smeses) -#define SMESMAXCHARGELEVEL 250000 -#define SMESMAXOUTPUT 250000 +//# define SMESMAXCHARGELEVEL 250000 Unused +//# define SMESMAXOUTPUT 250000 Unused /obj/machinery/power/smes name = "power storage unit" @@ -511,4 +511,4 @@ GLOBAL_LIST_EMPTY(smeses) // Description: Sets output setting on this SMES. Trims it if limits are exceeded. /obj/machinery/power/smes/proc/set_output(var/new_output = 0) output_level = between(0, new_output, output_level_max) - update_icon() \ No newline at end of file + update_icon() diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 60c42b037c..94d46d8581 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -1,4 +1,4 @@ -//#define SOLAR_MAX_DIST 40 //VOREStation Removal +//# define SOLAR_MAX_DIST 40 //VOREStation Removal #define SOLAR_AUTO_START_NO 0 // Will never start itself. #define SOLAR_AUTO_START_YES 1 // Will always start itself. #define SOLAR_AUTO_START_CONFIG 2 // Will start itself if config allows it (default is no). @@ -552,3 +552,7 @@ GLOBAL_LIST_EMPTY(solars_list) /obj/item/weapon/paper/solar name = "paper- 'Going green! Setup your own solar array instructions.'" info = "

Welcome

At greencorps we love the environment, and space. With this package you are able to help mother nature and produce energy without any usage of fossil fuel or phoron! Singularity energy is dangerous while solar energy is safe, which is why it's better. Now here is how you setup your own solar array.

You can make a solar panel by wrenching the solar assembly onto a cable node. Adding a glass panel, reinforced or regular glass will do, will finish the construction of your solar panel. It is that easy!

Now after setting up 19 more of these solar panels you will want to create a solar tracker to keep track of our mother nature's gift, the SSsun.sun. These are the same steps as before except you insert the tracker equipment circuit into the assembly before performing the final step of adding the glass. You now have a tracker! Now the last step is to add a computer to calculate the SSsun.sun's movements and to send commands to the solar panels to change direction with the SSsun.sun. Setting up the solar computer is the same as setting up any computer, so you should have no trouble in doing that. You do need to put a wire node under the computer, and the wire needs to be connected to the tracker.

Congratulations, you should have a working solar array. If you are having trouble, here are some tips. Make sure all solar equipment are on a cable node, even the computer. You can always deconstruct your creations if you make a mistake.

That's all to it, be safe, be green!

" + +#undef SOLAR_AUTO_START_NO +#undef SOLAR_AUTO_START_YES +#undef SOLAR_AUTO_START_CONFIG diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index dfd733d934..e4d976a3b6 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -550,6 +550,12 @@ STOP_PROCESSING(SSobj, src) return ..() +#undef POWER_FACTOR +#undef DECAY_FACTOR +#undef CRITICAL_TEMPERATURE +#undef CHARGING_FACTOR +#undef DAMAGE_RATE_LIMIT + #undef NITROGEN_RETARDATION_FACTOR #undef THERMAL_RELEASE_MODIFIER #undef PHORON_RELEASE_MODIFIER diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index a3530f8e41..0df7780ab0 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -314,3 +314,6 @@ if (EB.energy > 0) EB.energy -= min(EB.energy, max(10, round(EB.energy * 0.05))) // VOREStation Edit End + +#undef TESLA_DEFAULT_POWER +#undef TESLA_MINI_POWER diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 772e190282..b9693bf59d 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -89,11 +89,6 @@ if (!BB) . += "This one is spent." -//Gun loading types -#define SINGLE_CASING 1 //The gun only accepts ammo_casings. ammo_magazines should never have this as their mag_type. -#define SPEEDLOADER 2 //Transfers casings from the mag to the gun when used. -#define MAGAZINE 4 //The magazine item itself goes inside the gun - //An item that holds casings and can be used to put them inside guns /obj/item/ammo_magazine name = "magazine" diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm index 689be8359d..40e9d37f96 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm @@ -30,6 +30,10 @@ if(environment.temperature > HEATMODE_TEMP - 30) . = TRUE +#undef LAVALAND_EQUIPMENT_EFFECT_PRESSURE +#undef HEATMODE_ATMOSPHERE +#undef HEATMODE_TEMP + /proc/offsite_environment_check(turf/simulated/T) . = TRUE if(!istype(T)) @@ -343,7 +347,6 @@ var/obj/effect/temp_visual/kinetic_blast/K = new /obj/effect/temp_visual/kinetic_blast(target_turf) K.color = color - //Modkits /obj/item/borg/upgrade/modkit name = "kinetic accelerator modification kit" @@ -732,3 +735,7 @@ /obj/item/borg/upgrade/modkit/tracer/adjustable/attack_self(mob/user) bolt_color = input(user,"","Choose Color",bolt_color) as color|null + +#undef KA_ENVIRO_TYPE_COLD +#undef KA_ENVIRO_TYPE_HOT +#undef KA_ENVIRO_TYPE_OFFSITE diff --git a/code/modules/projectiles/guns/magnetic/bore.dm b/code/modules/projectiles/guns/magnetic/bore.dm index 21077bb05a..b390d48ff0 100644 --- a/code/modules/projectiles/guns/magnetic/bore.dm +++ b/code/modules/projectiles/guns/magnetic/bore.dm @@ -270,3 +270,8 @@ /obj/item/weapon/gun/magnetic/matfed/phoronbore/loaded cell = /obj/item/weapon/cell/apc capacitor = /obj/item/weapon/stock_parts/capacitor + +#undef GEN_STARTING +#undef GEN_OFF +#undef GEN_IDLE +#undef GEN_ACTIVE diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 11758b9c8a..4627a611ae 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -1,7 +1,3 @@ -#define HOLD_CASINGS 0 //do not do anything after firing. Manual action, like pump shotguns, or guns that want to define custom behaviour -#define EJECT_CASINGS 1 //drop spent casings on the ground after firing -#define CYCLE_CASINGS 2 //experimental: cycle casings, like a revolver. Also works for multibarrelled guns - /obj/item/weapon/gun/projectile name = "gun" desc = "A gun that fires bullets." diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index fe438ead6d..d8274ed23e 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -852,3 +852,6 @@ if(silenced) volume = 5 playsound(A, hitsound_wall, volume, 1, -1) + +#undef MOVES_HITSCAN +#undef MUZZLE_EFFECT_PIXEL_INCREMENT diff --git a/code/modules/random_map/automata/automata.dm b/code/modules/random_map/automata/automata.dm index 544b625a33..50b53577c5 100644 --- a/code/modules/random_map/automata/automata.dm +++ b/code/modules/random_map/automata/automata.dm @@ -1,4 +1,3 @@ -#define CELL_ALIVE(VAL) (VAL == cell_live_value) #define KILL_CELL(CELL, NEXT_MAP) NEXT_MAP[CELL] = cell_dead_value; #define REVIVE_CELL(CELL, NEXT_MAP) NEXT_MAP[CELL] = cell_live_value; @@ -68,4 +67,4 @@ return #undef KILL_CELL -#undef REVIVE_CELL \ No newline at end of file +#undef REVIVE_CELL diff --git a/code/modules/random_map/drop/droppod.dm b/code/modules/random_map/drop/droppod.dm index dace62feee..5e57f76923 100644 --- a/code/modules/random_map/drop/droppod.dm +++ b/code/modules/random_map/drop/droppod.dm @@ -226,3 +226,9 @@ return new /datum/random_map/droppod(null, usr.x-1, usr.y-1, usr.z, supplied_drops = spawned_mobs, automated = automatic_pod) + +#undef SD_FLOOR_TILE +#undef SD_WALL_TILE +#undef SD_DOOR_TILE +#undef SD_EMPTY_TILE +#undef SD_SUPPLY_TILE diff --git a/code/modules/reagents/machinery/dispenser/_defines.dm b/code/modules/reagents/machinery/dispenser/_defines.dm index 8d52cf5cd0..c3331cb418 100644 --- a/code/modules/reagents/machinery/dispenser/_defines.dm +++ b/code/modules/reagents/machinery/dispenser/_defines.dm @@ -4,5 +4,4 @@ // Chemistry dispenser starts with 21 // ERT dispenser starts with 28 -#define DISPENSER_MAX_CARTRIDGES 30 - +// #define DISPENSER_MAX_CARTRIDGES 30 //changed to var diff --git a/code/modules/reagents/machinery/dispenser/dispenser2.dm b/code/modules/reagents/machinery/dispenser/dispenser2.dm index bd9c85b24c..f124f0367d 100644 --- a/code/modules/reagents/machinery/dispenser/dispenser2.dm +++ b/code/modules/reagents/machinery/dispenser/dispenser2.dm @@ -14,6 +14,7 @@ var/accept_drinking = 0 var/amount = 30 + var/max_catriges = 30 use_power = USE_POWER_IDLE idle_power_usage = 100 @@ -28,7 +29,7 @@ /obj/machinery/chemical_dispenser/examine(mob/user) . = ..() - . += "It has [cartridges.len] cartridges installed, and has space for [DISPENSER_MAX_CARTRIDGES - cartridges.len] more." + . += "It has [cartridges.len] cartridges installed, and has space for [max_catriges - cartridges.len] more." /obj/machinery/chemical_dispenser/verb/rotate_clockwise() set name = "Rotate Dispenser Clockwise" @@ -47,7 +48,7 @@ to_chat(user, "\The [C] will not fit in \the [src]!") return - if(cartridges.len >= DISPENSER_MAX_CARTRIDGES) + if(cartridges.len >= max_catriges) if(user) to_chat(user, "\The [src] does not have any slots open for \the [C] to fit into!") return diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index e8c31672b1..6075e3e715 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -196,6 +196,10 @@ if((. = ..())) update() +#undef OFF +#undef FORWARDS +#undef BACKWARDS + // the conveyor control switch // // diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 8eff337f57..cd6753ba64 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -1646,3 +1646,7 @@ dirs = alldirs.Copy() src.streak(dirs) + +#undef SEND_PRESSURE +#undef PRESSURE_TANK_VOLUME +#undef PUMP_MAX_FLOW_RATE diff --git a/code/modules/scripting/Interpreter/Interpreter.dm b/code/modules/scripting/Interpreter/Interpreter.dm index 66ea0637cf..5287c55dff 100644 --- a/code/modules/scripting/Interpreter/Interpreter.dm +++ b/code/modules/scripting/Interpreter/Interpreter.dm @@ -307,3 +307,6 @@ S - The scope the variable resides in. If it is null, a scope with the varia //TODO: check for invalid name S.variables["[name]"] = value +#undef RETURNING +#undef BREAKING +#undef CONTINUING diff --git a/code/modules/scripting/Parser/Expressions.dm b/code/modules/scripting/Parser/Expressions.dm index 1e25c9be69..480b73f5a9 100644 --- a/code/modules/scripting/Parser/Expressions.dm +++ b/code/modules/scripting/Parser/Expressions.dm @@ -308,3 +308,8 @@ See Also: */ /n_Parser/nS_Parser/proc/ParseParamExpression() return ParseExpression(list(",", ")")) + +#undef OPERATOR +#undef VALUE +#undef SHIFT +#undef REDUCE diff --git a/code/modules/scripting/Scanner/Scanner.dm b/code/modules/scripting/Scanner/Scanner.dm index be391bddde..915540257b 100644 --- a/code/modules/scripting/Scanner/Scanner.dm +++ b/code/modules/scripting/Scanner/Scanner.dm @@ -271,3 +271,4 @@ Reads a comment and outputs the type of comment if(comm == 2) errors+=new/scriptError/UnterminatedComment() +#undef COL diff --git a/code/modules/stockmarket/events.dm b/code/modules/stockmarket/events.dm index 8b6d2c8e70..0b4b595740 100644 --- a/code/modules/stockmarket/events.dm +++ b/code/modules/stockmarket/events.dm @@ -230,4 +230,6 @@ else article += "[tname] has a prior history of similar misdeeds and we're confident the charges will stand. For investors, now would be an ideal time to %sell%" A.article = A.detokenize(article, company.industry.tokens) - return A \ No newline at end of file + return A + +#undef TIME_MULTIPLIER diff --git a/code/modules/tgui/modules/admin/player_notes.dm b/code/modules/tgui/modules/admin/player_notes.dm index 6f20bdc11d..38555479e9 100644 --- a/code/modules/tgui/modules/admin/player_notes.dm +++ b/code/modules/tgui/modules/admin/player_notes.dm @@ -329,3 +329,5 @@ if("filter") PlayerNotesFilterLegacy() return + +#undef PLAYER_NOTES_ENTRIES_PER_PAGE diff --git a/code/modules/tgui/modules/communications.dm b/code/modules/tgui/modules/communications.dm index 6a726aae9c..ab1a5755e4 100644 --- a/code/modules/tgui/modules/communications.dm +++ b/code/modules/tgui/modules/communications.dm @@ -485,3 +485,14 @@ if(M.stat == 0) return 1 return 0 + +#undef COMM_SCREEN_MAIN +#undef COMM_SCREEN_STAT +#undef COMM_SCREEN_MESSAGES + +#undef COMM_AUTHENTICATION_NONE +#undef COMM_AUTHENTICATION_MIN +#undef COMM_AUTHENTICATION_MAX + +#undef COMM_MSGLEN_MINIMUM +#undef COMM_CCMSGLEN_MINIMUM diff --git a/code/modules/tgui/modules/rcon.dm b/code/modules/tgui/modules/rcon.dm index 0a29153d76..7f1f0822a9 100644 --- a/code/modules/tgui/modules/rcon.dm +++ b/code/modules/tgui/modules/rcon.dm @@ -13,7 +13,7 @@ var/number_pages = 0 /datum/tgui_module/rcon/proc/filter_smeslist(var/page) - number_pages = known_SMESs.len / SMES_PER_PAGE + number_pages = known_SMESs.len / SMES_PER_PAGE if(number_pages != round(number_pages)) number_pages = round(number_pages) + 1 @@ -136,7 +136,9 @@ /datum/tgui_module/rcon/ntos ntos = TRUE - + /datum/tgui_module/rcon/robot /datum/tgui_module/rcon/robot/tgui_state(mob/user) - return GLOB.tgui_self_state \ No newline at end of file + return GLOB.tgui_self_state + +#undef SMES_PER_PAGE diff --git a/code/modules/xenobio2/mob/slime/slime life.dm b/code/modules/xenobio2/mob/slime/slime life.dm index cc784a63d1..f6e91f4912 100644 --- a/code/modules/xenobio2/mob/slime/slime life.dm +++ b/code/modules/xenobio2/mob/slime/slime life.dm @@ -52,4 +52,7 @@ Slime specific life events go here. return 0 //Everything worked okay - return //xeno/Life() returned 0. \ No newline at end of file + return //xeno/Life() returned 0. + +#undef HAPPYLEVEL +#undef ANGRYLEVEL diff --git a/code/modules/xenobio2/mob/slime/slime procs.dm b/code/modules/xenobio2/mob/slime/slime procs.dm index ac03f788c3..2bd5912958 100644 --- a/code/modules/xenobio2/mob/slime/slime procs.dm +++ b/code/modules/xenobio2/mob/slime/slime procs.dm @@ -126,3 +126,7 @@ Slime specific procs go here. GenerateChild() else GenerateAdult() + +#undef SHINYOVERLAY +#undef LIGHTOVERLAY +#undef MAXOVERLAY diff --git a/vorestation.dme b/vorestation.dme index 5d7209c2fe..904909c7b9 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -31,7 +31,9 @@ #include "code\__defines\_tick.dm" #include "code\__defines\admin.dm" #include "code\__defines\admin_vr.dm" +#include "code\__defines\ammunition.dm" #include "code\__defines\appearance.dm" +#include "code\__defines\assemblies.dm" #include "code\__defines\atmos.dm" #include "code\__defines\atoms_movable.dm" #include "code\__defines\belly_modes_vr.dm" @@ -41,11 +43,15 @@ #include "code\__defines\chemistry_vr.dm" #include "code\__defines\color.dm" #include "code\__defines\color_priority.dm" +#include "code\__defines\construction_datum.dm" #include "code\__defines\construction.dm" #include "code\__defines\cooldowns.dm" #include "code\__defines\crafting.dm" +#include "code\__defines\events.dm" +#include "code\__defines\equipment_vendor.dm" #include "code\__defines\damage_organs.dm" #include "code\__defines\dna.dm" +#include "code\__defines\economy_misc.dm" #include "code\__defines\exosuit_fab.dm" #include "code\__defines\flags.dm" #include "code\__defines\gamemode.dm" @@ -70,10 +76,13 @@ #include "code\__defines\misc.dm" #include "code\__defines\misc_vr.dm" #include "code\__defines\mobs.dm" +#include "code\__defines\organ_internal.dm" +#include "code\__defines\observer.dm" #include "code\__defines\mobs_vr.dm" #include "code\__defines\nifsoft.dm" #include "code\__defines\objects.dm" #include "code\__defines\overmap.dm" +#include "code\__defines\power.dm" #include "code\__defines\pda.dm" #include "code\__defines\planets.dm" #include "code\__defines\planets_vr.dm" @@ -81,8 +90,11 @@ #include "code\__defines\preferences.dm" #include "code\__defines\process_scheduler.dm" #include "code\__defines\procpath.dm" +#include "code\__defines\projectile.dm" #include "code\__defines\projectiles.dm" #include "code\__defines\qdel.dm" +#include "code\__defines\recipe.dm" +#include "code\__defines\robot.dm" #include "code\__defines\research.dm" #include "code\__defines\roguemining_vr.dm" #include "code\__defines\rust_g.dm" @@ -2407,7 +2419,6 @@ #include "code\modules\food\kitchen\smartfridge\service.dm" #include "code\modules\food\kitchen\smartfridge\smartfridge.dm" #include "code\modules\food\kitchen\smartfridge\smartfridge_vr.dm" -#include "code\modules\gamemaster\defines.dm" #include "code\modules\gamemaster\event2\event.dm" #include "code\modules\gamemaster\event2\meta.dm" #include "code\modules\gamemaster\event2\events\ghost_pod_spawner.dm" @@ -2610,7 +2621,6 @@ #include "code\modules\keybindings\setup.dm" #include "code\modules\library\lib_items.dm" #include "code\modules\library\lib_machines.dm" -#include "code\modules\library\lib_readme.dm" #include "code\modules\library\hardcode_library\_library.dm" #include "code\modules\library\hardcode_library\fiction\APsychonaut.dm" #include "code\modules\library\hardcode_library\fiction\battlefieldcommander.dm"