Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65,540 changes: 65,540 additions & 0 deletions _maps/map_files/dragon_outpost/dragon_outpost.dmm

Large diffs are not rendered by default.

45 changes: 0 additions & 45 deletions code/__DEFINES/construction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,6 @@
#define SUPPORT_RODS 5
#define SHEATH 6

//window construction states
#define WINDOW_OUT_OF_FRAME 0
#define WINDOW_IN_FRAME 1
#define WINDOW_SCREWED_TO_FRAME 2

//airlock assembly construction states
#define AIRLOCK_ASSEMBLY_NEEDS_WIRES 0
#define AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS 1
#define AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER 2

//blast door (de)construction states
#define BLASTDOOR_NEEDS_WIRES 0
#define BLASTDOOR_NEEDS_ELECTRONICS 1
#define BLASTDOOR_FINISHED 2

//default_unfasten_wrench() return defines
#define CANT_UNFASTEN 0
#define FAILED_UNFASTEN 1
Expand Down Expand Up @@ -104,35 +89,5 @@
#define CAT_CHEMISTRY "Chemistry"
#define CAT_ATMOSPHERIC "Atmospheric"

//rcd modes
#define RCD_FLOORWALL 0
#define RCD_AIRLOCK 1
#define RCD_DECONSTRUCT 2
#define RCD_WINDOWGRILLE 3
#define RCD_MACHINE 4
#define RCD_COMPUTER 5
#define RCD_FURNISHING 6

#define RCD_UPGRADE_FRAMES (1<<0)
#define RCD_UPGRADE_SIMPLE_CIRCUITS (1<<1)
#define RCD_UPGRADE_SILO_LINK (1<<2)
#define RCD_UPGRADE_FURNISHING (1<<3)

#define RPD_UPGRADE_UNWRENCH (1<<0)

#define RCD_WINDOW_FULLTILE "full tile"
#define RCD_WINDOW_DIRECTIONAL "directional"
#define RCD_WINDOW_NORMAL "glass"
#define RCD_WINDOW_REINFORCED "reinforced glass"

#define RCD_MEMORY_WALL 1
#define RCD_MEMORY_WINDOWGRILLE 2

// How much faster to use the RCD when on a tile with memory
#define RCD_MEMORY_SPEED_BUFF 5

/// How much less resources the RCD uses when reconstructing
#define RCD_MEMORY_COST_BUFF 8

/// How many sheets does it cost to make a fulltile window
#define SHEETS_FOR_FULLTILE_WINDOW 2
2 changes: 0 additions & 2 deletions code/__DEFINES/dcs/signals/signals_atom/signals_atom_x_act.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
#define COMSIG_ATOM_ACID_ACT "atom_acid_act"
///from base of atom/emag_act(): (/mob/user)
#define COMSIG_ATOM_EMAG_ACT "atom_emag_act"
///from base of atom/rcd_act(): (/mob, /obj/item/construction/rcd, passed_mode)
#define COMSIG_ATOM_RCD_ACT "atom_rcd_act"
///from base of atom/singularity_pull(): (/datum/component/singularity, current_size)
#define COMSIG_ATOM_SING_PULL "atom_sing_pull"
///from obj/machinery/bsa/full/proc/fire(): ()
Expand Down
2 changes: 0 additions & 2 deletions code/__DEFINES/dcs/signals/signals_mob/signals_mob_living.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
///from base of mob/living/update_transform()
#define COMSIG_MOB_POST_UPDATE_TRANSFORM "mob_post_update_transform"

///from /obj/structure/door/crush(): (mob/living/crushed, /obj/machinery/door/crushing_door)
#define COMSIG_LIVING_DOORCRUSHED "living_doorcrush"
///from base of mob/living/resist() (/mob/living)
#define COMSIG_LIVING_RESIST "living_resist"
///from base of mob/living/ignite_mob() (/mob/living)
Expand Down
13 changes: 0 additions & 13 deletions code/__DEFINES/dcs/signals/signals_object.dm
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@
/// from /obj/machinery/light_switch/set_lights(), sent to every switch in the area: (status)
#define COMSIG_LIGHT_SWITCH_SET "light_switch_set"

/// from /obj/machinery/fire_alarm/reset(), /obj/machinery/fire_alarm/alarm(): (status)
#define COMSIG_FIREALARM_ON_TRIGGER "firealarm_trigger"
#define COMSIG_FIREALARM_ON_RESET "firealarm_reset"

// /obj access signals

#define COMSIG_OBJ_ALLOWED "door_try_to_activate"
Expand All @@ -85,14 +81,6 @@
#define COMSIG_AIRLOCK_SHELL_ALLOWED "airlock_shell_try_allowed"
#define COMPONENT_AIRLOCK_SHELL_ALLOW (1<<0)

// /obj/machinery/door/airlock signals

//from /obj/machinery/door/airlock/open(): (forced)
#define COMSIG_AIRLOCK_OPEN "airlock_open"
//from /obj/machinery/door/airlock/close(): (forced)
#define COMSIG_AIRLOCK_CLOSE "airlock_close"
///from /obj/machinery/door/airlock/set_bolt():
#define COMSIG_AIRLOCK_SET_BOLT "airlock_set_bolt"
// /obj/item signals

///from base of obj/item/equipped(): (/mob/equipper, slot)
Expand Down Expand Up @@ -417,4 +405,3 @@
/// from base of /obj/item/slimepotion/speed/afterattack(): (obj/target, /obj/src, mob/user)
#define COMSIG_SPEED_POTION_APPLIED "speed_potion"
#define SPEED_POTION_STOP (1<<0)

2 changes: 1 addition & 1 deletion code/__DEFINES/explosions.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// The severity of explosions. Why are these inverted? I have no idea, but git blame doesn't go back far enough for me to find out.
// The severity of explosions. Why are these inverted? I have no idea, but git blame doesn't go back far enough for me to find out. BOLD FACED LIE. I CHECKED GIT BLAME. YOU INVERTED IT!!
/// The (current) highest possible explosion severity.
#define EXPLODE_DEVASTATE 3
/// The (current) middling explosion severity.
Expand Down
16 changes: 4 additions & 12 deletions code/__DEFINES/icon_smoothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -106,21 +106,13 @@ DEFINE_BITFIELD(smoothing_flags, list(

#define SMOOTH_GROUP_WALLS S_OBJ(1) ///turf/closed/wall, /obj/structure/falsewall
#define SMOOTH_GROUP_HIERO_WALL S_OBJ(2) ///obj/effect/temp_visual/elite_tumor_wall, /obj/effect/temp_visual/hierophant/wall
#define SMOOTH_GROUP_SURVIVAL_TITANIUM_POD S_OBJ(3) ///turf/closed/wall/mineral/titanium/survival/pod, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/reinforced/shuttle/survival_pod
#define SMOOTH_GROUP_SURVIVAL_TITANIUM_POD S_OBJ(3) ///turf/closed/wall/mineral/titanium/survival/pod

#define SMOOTH_GROUP_PAPERFRAME S_OBJ(4) ///obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe

#define SMOOTH_GROUP_WINDOW_FULLTILE S_OBJ(21) ///turf/closed/indestructible/fakeglass, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/reinforced/plasma/fulltile
#define SMOOTH_GROUP_WINDOW_FULLTILE_BRONZE S_OBJ(22) ///obj/structure/window/bronze/fulltile
#define SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM S_OBJ(23) ///turf/closed/indestructible/opsglass, /obj/structure/window/reinforced/plasma/plastitanium
#define SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE S_OBJ(24) ///obj/structure/window/reinforced/shuttle
#define SMOOTH_GROUP_PAPERFRAME S_OBJ(4) ///obj/structure/mineral_door/paperframe

#define SMOOTH_GROUP_LATTICE S_OBJ(30) ///obj/structure/lattice
#define SMOOTH_GROUP_CATWALK S_OBJ(31) ///obj/structure/lattice/catwalk
#define SMOOTH_GROUP_GRILLE S_OBJ(32) ///obj/structure/grille

#define SMOOTH_GROUP_AIRLOCK S_OBJ(40) ///obj/machinery/door/airlock
#define SMOOTH_GROUP_SHUTTERS_BLASTDOORS S_OBJ(41) ///obj/machinery/door/poddoor
#define SMOOTH_GROUP_GRILLE S_OBJ(32) ///obj/structure/grillen

#define SMOOTH_GROUP_TABLES S_OBJ(50) ///obj/structure/table
#define SMOOTH_GROUP_WOOD_TABLES S_OBJ(51) ///obj/structure/table/wood
Expand All @@ -139,7 +131,7 @@ DEFINE_BITFIELD(smoothing_flags, list(

#define SMOOTH_GROUP_HEDGE_FLUFF S_OBJ(65) ///obj/structure/hedge

#define SMOOTH_GROUP_SHUTTLE_PARTS S_OBJ(66) ///turf/closed/indestructible/opsglass, /obj/structure/shuttle, /obj/structure/window/reinforced/shuttle/survival_pod
#define SMOOTH_GROUP_SHUTTLE_PARTS S_OBJ(66) ///turf/closed/indestructible/opsglass, /obj/structure/shuttle

#define SMOOTH_GROUP_CLEANABLE_DIRT S_OBJ(67) ///obj/effect/decal/cleanable/dirt

Expand Down
1 change: 0 additions & 1 deletion code/__DEFINES/layers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ Specifically: ZMIMIC_MAX_PLANE to (ZMIMIC_MAX_PLANE - ZMIMIC_MAX_DEPTH)

//#define OBJ_LAYER 3 //For easy recordkeeping; this is a byond define
#define CLOSED_DOOR_LAYER 3.1
#define CLOSED_FIREDOOR_LAYER 3.11
#define ABOVE_OBJ_LAYER 3.2
#define SHUTTER_LAYER_CLOSED 3.21
#define CLOSED_BLASTDOOR_LAYER 3.22
Expand Down
10 changes: 0 additions & 10 deletions code/__DEFINES/machines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@
#define START_PROCESSING_ON_INIT (1<<0) /// Indicates the machine will automatically start processing right after it's `Initialize()` is ran.
#define START_PROCESSING_MANUALLY (1<<1) /// Machines with this flag will not start processing when it's spawned. Use this if you want to manually control when a machine starts processing.

//bitflags for door switches.
#define OPEN (1<<0)
#define IDSCAN (1<<1)
#define BOLTS (1<<2)
#define SHOCK (1<<3)
#define SAFE (1<<4)

//used in design to specify which machine can build it
#define FABRICATOR (1<<0) //For circuits. Uses glass/chemicals.
#define AUTOLATHE (1<<1) //Prints basic designs without research
Expand Down Expand Up @@ -104,9 +97,6 @@
#define PROGRAM_CATEGORY_SCI "Science"
#define PROGRAM_CATEGORY_MISC "Other"

#define FIREDOOR_OPEN 1
#define FIREDOOR_CLOSED 2

#define HYPERTORUS_INACTIVE 0 // No or minimal energy
#define HYPERTORUS_NOMINAL 1 // Normal operation
#define HYPERTORUS_WARNING 2 // Integrity damaged
Expand Down
1 change: 0 additions & 1 deletion code/__DEFINES/memory_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#define NOTES_BANK_ACCOUNT "Bank"
#define NOTES_ANTAG "Antag"
#define NOTES_TRAITS "Traits"
#define NOTES_DOOR_CODES "Door Codes"

///name of the file that has all the saved engravings
#define ENGRAVING_SAVE_FILE "data/engravings/[SSmapping.config.map_name]_engravings.json"
Expand Down
1 change: 0 additions & 1 deletion code/__DEFINES/obj_flags.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
///Used by security bots to determine if this item is safe for public use.
#define NEEDS_PERMIT (1<<3)
#define SLOWS_WHILE_IN_HAND (1<<4)
#define NO_MAT_REDEMPTION (1<<5) // Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
#define DROPDEL (1<<6) // When dropped, it calls qdel on itself
#define NOBLUDGEON (1<<7) // when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
#define ABSTRACT (1<<9) // for all things that are technically items but used for various different stuff <= wow thanks for the fucking insight sherlock
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/path.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define CANASTARPASS_ALWAYS_PROC 1

/**
* A helper macro to see if it's possible to step from the first turf into the second one, minding things like door access and directional windows.
* A helper macro to see if it's possible to step from the first turf into the second one
* Note that this can only be used inside the [datum/pathfind][pathfind datum] since it uses variables from said datum.
* If you really want to optimize things, optimize this, cuz this gets called a lot.
*/
Expand Down
3 changes: 0 additions & 3 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -673,9 +673,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// Trait put on [/mob/living/carbon/human]. If that mob has a crystal core, also known as an ethereal heart, it will not try to revive them if the mob dies.
#define TRAIT_CANNOT_CRYSTALIZE "cannot_crystalize"

///Trait applied to turfs when an atmos holosign is placed on them. It will stop firedoors from closing.
#define TRAIT_FIREDOOR_STOP "firedoor_stop"

/// Trait applied when the MMI component is added to an [/obj/item/integrated_circuit]
#define TRAIT_COMPONENT_MMI "component_mmi"
/// Trait applied when the MMI component is added to an [/obj/item/integrated_circuit]
Expand Down
3 changes: 0 additions & 3 deletions code/__HELPERS/areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/station/en

newA.reg_in_areas_in_z()

for(var/thing2move in oldA.firedoors + oldA.firealarms + oldA.airalarms)
thing2move:set_area(get_area(thing2move)) //Dude trust me

if(!isarea(area_choice) && (newA.area_lighting == AREA_LIGHTING_DYNAMIC))
newA.create_area_lighting_objects()

Expand Down
10 changes: 0 additions & 10 deletions code/__HELPERS/construction.dm

This file was deleted.

4 changes: 0 additions & 4 deletions code/__HELPERS/global_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -154,20 +154,16 @@ GLOBAL_LIST_INIT(WALLITEMS_INTERIOR, typecacheof(list(
/obj/item/storage/secure/safe,
/obj/machinery/airalarm,
/obj/machinery/newscaster,
/obj/machinery/button,
/obj/machinery/computer/security/telescreen,
/obj/machinery/computer/security/telescreen/entertainment,
/obj/machinery/defibrillator_mount,
/obj/machinery/door_timer,
/obj/machinery/embedded_controller/radio/simple_vent_controller,
/obj/machinery/firealarm,
/obj/machinery/flasher,
/obj/machinery/keycard_auth,
/obj/machinery/light_switch,
/obj/machinery/power/apc,
/obj/machinery/requests_console,
/obj/machinery/status_display,
/obj/machinery/ticket_machine,
/obj/machinery/turretid,
/obj/structure/extinguisher_cabinet,
/obj/structure/fireaxecabinet,
Expand Down
2 changes: 1 addition & 1 deletion code/__HELPERS/paths/jps_path.dm
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@
if(TURF_PATHING_PASS_NO)
return TRUE

var/static/list/directional_blocker_cache = typecacheof(list(/obj/structure/window, /obj/machinery/door/window, /obj/structure/railing, /obj/machinery/door/firedoor/border_only))
var/static/list/directional_blocker_cache = typecacheof(list(/obj/structure/railing))
// Source border object checks
for(var/obj/border in src)
if(!directional_blocker_cache[border.type])
Expand Down
11 changes: 0 additions & 11 deletions code/__HELPERS/turfs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -398,17 +398,6 @@ Turf and target are separate in case you want to teleport some distance from a t
if(!dest_turf)
return FALSE
for(var/obj/turf_content in dest_turf)
if(istype(turf_content, /obj/machinery/door/window))
if((turf_content.dir == test_dir) || is_fulltile)
return FALSE
if(istype(turf_content, /obj/structure/windoor_assembly))
var/obj/structure/windoor_assembly/windoor_assembly = turf_content
if(windoor_assembly.dir == test_dir || is_fulltile)
return FALSE
if(istype(turf_content, /obj/structure/window))
var/obj/structure/window/window_structure = turf_content
if(window_structure.dir == test_dir || window_structure.fulltile || is_fulltile)
return FALSE
if(istype(turf_content, /obj/structure/railing))
var/obj/structure/railing/rail = turf_content
if(rail.dir == test_dir || is_fulltile)
Expand Down
2 changes: 0 additions & 2 deletions code/__HELPERS/type_processing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
/obj/item/reagent_containers = "REAGENT_CONTAINERS",
/obj/machinery/atmospherics = "ATMOS_MECH",
/obj/machinery/portable_atmospherics = "PORT_ATMOS",
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = "MECHA_MISSILE_RACK",
/obj/item/mecha_parts/mecha_equipment = "MECHA_EQUIP",
/obj/item/organ = "ORGAN",
/obj/item = "ITEM",
/obj/machinery = "MACHINERY",
Expand Down
1 change: 0 additions & 1 deletion code/_globalvars/bitfields.dm
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ DEFINE_BITFIELD(item_flags, list(
"ITEM_HAS_CONTEXTUAL_SCREENTIPS" = ITEM_HAS_CONTEXTUAL_SCREENTIPS,
"NEEDS_PERMIT" = NEEDS_PERMIT,
"NOBLUDGEON" = NOBLUDGEON,
"NO_MAT_REDEMPTION" = NO_MAT_REDEMPTION,
"NO_PIXEL_RANDOM_DROP" = NO_PIXEL_RANDOM_DROP,
"SLOWS_WHILE_IN_HAND" = SLOWS_WHILE_IN_HAND,
"SURGICAL_TOOL" = SURGICAL_TOOL,
Expand Down
3 changes: 0 additions & 3 deletions code/_globalvars/lists/maintenance_loot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ GLOBAL_LIST_INIT(trash_loot, list(//junk: useless, very easy to get, or ghetto c
/obj/item/light/tube = 1,
/obj/item/reagent_containers/food/drinks/drinkingglass = 1,

/obj/item/airlock_painter = 1,
/obj/item/airlock_painter/decal = 1,
/obj/item/airlock_painter/decal/tile = 1,
/obj/item/clothing/mask/breath = 1,
/obj/item/shard = 1,

Expand Down
12 changes: 0 additions & 12 deletions code/_globalvars/phobias.dm
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/item/stamp/hos,
/obj/item/toy/figure/hos,
/obj/item/toy/figure/secofficer,
/obj/machinery/door/airlock/security,
/obj/structure/statue/gold/hos,
/obj/structure/statue/silver/sec,
/obj/structure/statue/silver/secborg,
Expand Down Expand Up @@ -146,11 +145,8 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/item/toy/mecha/darkhonk,
/obj/item/toy/mecha/honk,
/obj/item/trash/cheesie,
/obj/machinery/door/airlock/bananium,
/obj/structure/mecha_wreckage/honker,
/obj/structure/statue/bananium,
/obj/vehicle/sealed/car/clowncar,
/obj/vehicle/sealed/mecha/combat/honker,
)),

"greytide" = (typecacheof(list(
Expand Down Expand Up @@ -215,7 +211,6 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/item/toy/figure/hos,
/obj/item/toy/figure/rd,
/obj/machinery/atmospherics/miner,
/obj/machinery/door/airlock/centcom,
)),

"robots" = typecacheof(list(
Expand Down Expand Up @@ -250,7 +245,6 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/item/surgicaldrill,
/obj/machinery/atmospherics/components/unary/cryo_cell,
/obj/machinery/dna_scannernew,
/obj/machinery/door/airlock/medical,
/obj/machinery/sleeper,
/obj/machinery/stasis,
/obj/structure/sign/departments/medbay,
Expand Down Expand Up @@ -284,7 +278,6 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/item/toy/figure/hop,
/obj/item/toy/figure/hos,
/obj/item/toy/figure/rd,
/obj/machinery/door/airlock/command,
/obj/structure/statue/diamond/captain,
/obj/structure/statue/gold/ce,
/obj/structure/statue/gold/cmo,
Expand Down Expand Up @@ -365,7 +358,6 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/item/throwing_star,
/obj/item/toy/katana,
/obj/structure/mineral_door/paperframe,
/obj/structure/window/paperframe,
)),

"birds" = typecacheof(list(
Expand All @@ -392,9 +384,6 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/item/gun/energy,
/obj/item/gun/grenadelauncher,
/obj/item/gun/syringe,
/obj/item/mecha_ammo,
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic,
/obj/item/mecha_parts/mecha_equipment/weapon/energy,
/obj/item/storage/belt/bandolier,
/obj/item/storage/belt/holster,
/obj/machinery/porta_turret,
Expand Down Expand Up @@ -427,7 +416,6 @@ GLOBAL_LIST_INIT(phobia_objs, list(
/obj/item/throwing_star,
/obj/item/toy/katana,
/obj/structure/mineral_door/paperframe,
/obj/structure/window/paperframe,
)),

"blood" = typecacheof(list(
Expand Down
Loading
Loading