Skip to content

Commit 3226c84

Browse files
LexanxLexanx
committed
Merge branch 'landing_pods' of https://github.com/Lexanx/SierraBay12 into landing_pods
2 parents 662c844 + 168c3b0 commit 3226c84

File tree

298 files changed

+24658
-1759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+24658
-1759
lines changed

‎baystation12.dme

Lines changed: 61 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
#include "code\__defines\overmap.dm"
7171
#include "code\__defines\proc_presets.dm"
7272
#include "code\__defines\procs.dm"
73-
#include "code\__defines\psi.dm"
73+
// #include "code\__defines\psi.dm"
7474
#include "code\__defines\qdel.dm"
7575
#include "code\__defines\research.dm"
7676
#include "code\__defines\ruin_tags.dm"
@@ -94,6 +94,7 @@
9494
#include "code\__defines\~mods\items_clothing.dm"
9595
#include "code\__defines\~mods\mechs.dm"
9696
#include "code\__defines\~mods\misc.dm"
97+
#include "code\__defines\~mods\mobs.dm"
9798
#include "code\__defines\~mods\rust_g.dm"
9899
#include "code\__defines\~mods\tg_signals.dm"
99100
#include "code\__defines\~mods\~master_defines.dm"
@@ -260,7 +261,7 @@
260261
#include "code\controllers\subsystems\processing\nano.dm"
261262
#include "code\controllers\subsystems\processing\obj.dm"
262263
#include "code\controllers\subsystems\processing\processing.dm"
263-
#include "code\controllers\subsystems\processing\psi.dm"
264+
// #include "code\controllers\subsystems\processing\psi.dm"
264265
#include "code\controllers\subsystems\processing\temperature.dm"
265266
#include "code\controllers\subsystems\processing\turf.dm"
266267
#include "code\controllers\subsystems\processing\vines.dm"
@@ -2077,6 +2078,13 @@
20772078
#include "code\modules\lighting\lighting_source.dm"
20782079
#include "code\modules\lighting\lighting_turf.dm"
20792080
#include "code\modules\lighting\~lighting_undefs.dm"
2081+
#include "code\modules\lightning_bolt\bar.dm"
2082+
#include "code\modules\lightning_bolt\beam.dm"
2083+
#include "code\modules\lightning_bolt\bolt.dm"
2084+
#include "code\modules\lightning_bolt\branched_bolt.dm"
2085+
#include "code\modules\lightning_bolt\line.dm"
2086+
#include "code\modules\lightning_bolt\segment.dm"
2087+
#include "code\modules\lightning_bolt\simple_vector.dm"
20802088
#include "code\modules\locks\key.dm"
20812089
#include "code\modules\locks\lock.dm"
20822090
#include "code\modules\locks\lock_construct.dm"
@@ -2886,48 +2894,48 @@
28862894
#include "code\modules\projectiles\targeting\targeting_mob.dm"
28872895
#include "code\modules\projectiles\targeting\targeting_overlay.dm"
28882896
#include "code\modules\projectiles\targeting\targeting_triggers.dm"
2889-
#include "code\modules\psionics\complexus\complexus.dm"
2890-
#include "code\modules\psionics\complexus\complexus_helpers.dm"
2891-
#include "code\modules\psionics\complexus\complexus_latency.dm"
2892-
#include "code\modules\psionics\complexus\complexus_power_cache.dm"
2893-
#include "code\modules\psionics\complexus\complexus_process.dm"
2894-
#include "code\modules\psionics\complexus\complexus_topic.dm"
2895-
#include "code\modules\psionics\equipment\cerebro_enhancers.dm"
2896-
#include "code\modules\psionics\equipment\foundation_implanter.dm"
2897-
#include "code\modules\psionics\equipment\foundation_weapon.dm"
2898-
#include "code\modules\psionics\equipment\implant.dm"
2899-
#include "code\modules\psionics\equipment\null_ammo.dm"
2900-
#include "code\modules\psionics\equipment\psimeter.dm"
2901-
#include "code\modules\psionics\equipment\psimonitor.dm"
2902-
#include "code\modules\psionics\equipment\psipower.dm"
2903-
#include "code\modules\psionics\equipment\psipower_blade.dm"
2904-
#include "code\modules\psionics\equipment\psipower_tinker.dm"
2905-
#include "code\modules\psionics\equipment\psipower_tk.dm"
2906-
#include "code\modules\psionics\events\_psi.dm"
2907-
#include "code\modules\psionics\events\mini_spasm.dm"
2908-
#include "code\modules\psionics\events\psi_balm.dm"
2909-
#include "code\modules\psionics\events\psi_wail.dm"
2910-
#include "code\modules\psionics\faculties\_faculty.dm"
2911-
#include "code\modules\psionics\faculties\_power.dm"
2912-
#include "code\modules\psionics\faculties\coercion.dm"
2913-
#include "code\modules\psionics\faculties\energistics.dm"
2914-
#include "code\modules\psionics\faculties\psychokinesis.dm"
2915-
#include "code\modules\psionics\faculties\redaction.dm"
2916-
#include "code\modules\psionics\interface\ui.dm"
2917-
#include "code\modules\psionics\interface\ui_hub.dm"
2918-
#include "code\modules\psionics\interface\ui_toggles.dm"
2919-
#include "code\modules\psionics\mob\mob.dm"
2920-
#include "code\modules\psionics\mob\mob_assay.dm"
2921-
#include "code\modules\psionics\mob\mob_interactions.dm"
2922-
#include "code\modules\psionics\null\_null.dm"
2923-
#include "code\modules\psionics\null\chemistry.dm"
2924-
#include "code\modules\psionics\null\flooring.dm"
2925-
#include "code\modules\psionics\null\material.dm"
2926-
#include "code\modules\psionics\null\material_sheet.dm"
2927-
#include "code\modules\psionics\null\material_weapon.dm"
2928-
#include "code\modules\psionics\null\turf_floor.dm"
2929-
#include "code\modules\psionics\null\turf_wall.dm"
2930-
#include "code\modules\psionics\null\~null.dm"
2897+
// #include "code\modules\psionics\complexus\complexus.dm"
2898+
// #include "code\modules\psionics\complexus\complexus_helpers.dm"
2899+
// #include "code\modules\psionics\complexus\complexus_latency.dm"
2900+
// #include "code\modules\psionics\complexus\complexus_power_cache.dm"
2901+
// #include "code\modules\psionics\complexus\complexus_process.dm"
2902+
// #include "code\modules\psionics\complexus\complexus_topic.dm"
2903+
// #include "code\modules\psionics\equipment\cerebro_enhancers.dm"
2904+
// #include "code\modules\psionics\equipment\foundation_implanter.dm"
2905+
// #include "code\modules\psionics\equipment\foundation_weapon.dm"
2906+
// #include "code\modules\psionics\equipment\implant.dm"
2907+
// #include "code\modules\psionics\equipment\null_ammo.dm"
2908+
// #include "code\modules\psionics\equipment\psimeter.dm"
2909+
// #include "code\modules\psionics\equipment\psimonitor.dm"
2910+
// #include "code\modules\psionics\equipment\psipower.dm"
2911+
// #include "code\modules\psionics\equipment\psipower_blade.dm"
2912+
// #include "code\modules\psionics\equipment\psipower_tinker.dm"
2913+
// #include "code\modules\psionics\equipment\psipower_tk.dm"
2914+
// #include "code\modules\psionics\events\_psi.dm"
2915+
// #include "code\modules\psionics\events\mini_spasm.dm"
2916+
// #include "code\modules\psionics\events\psi_balm.dm"
2917+
// #include "code\modules\psionics\events\psi_wail.dm"
2918+
// #include "code\modules\psionics\faculties\_faculty.dm"
2919+
// #include "code\modules\psionics\faculties\_power.dm"
2920+
// #include "code\modules\psionics\faculties\coercion.dm"
2921+
// #include "code\modules\psionics\faculties\energistics.dm"
2922+
// #include "code\modules\psionics\faculties\psychokinesis.dm"
2923+
// #include "code\modules\psionics\faculties\redaction.dm"
2924+
// #include "code\modules\psionics\interface\ui.dm"
2925+
// #include "code\modules\psionics\interface\ui_hub.dm"
2926+
// #include "code\modules\psionics\interface\ui_toggles.dm"
2927+
// #include "code\modules\psionics\mob\mob.dm"
2928+
// #include "code\modules\psionics\mob\mob_assay.dm"
2929+
// #include "code\modules\psionics\mob\mob_interactions.dm"
2930+
// #include "code\modules\psionics\null\_null.dm"
2931+
// #include "code\modules\psionics\null\chemistry.dm"
2932+
// #include "code\modules\psionics\null\flooring.dm"
2933+
// #include "code\modules\psionics\null\material.dm"
2934+
// #include "code\modules\psionics\null\material_sheet.dm"
2935+
// #include "code\modules\psionics\null\material_weapon.dm"
2936+
// #include "code\modules\psionics\null\turf_floor.dm"
2937+
// #include "code\modules\psionics\null\turf_wall.dm"
2938+
// #include "code\modules\psionics\null\~null.dm"
29312939
#include "code\modules\radiation\radiation.dm"
29322940
#include "code\modules\random_map\_random_map_setup.dm"
29332941
#include "code\modules\random_map\random_map.dm"
@@ -3030,17 +3038,17 @@
30303038
#include "code\modules\recycling\disposalholder.dm"
30313039
#include "code\modules\recycling\disposalpipe.dm"
30323040
#include "code\modules\recycling\sortingmachinery.dm"
3033-
#include "code\modules\research\circuitprinter.dm"
3034-
#include "code\modules\research\destructive_analyzer.dm"
3041+
//#include "code\modules\research\circuitprinter.dm"
3042+
//#include "code\modules\research\destructive_analyzer.dm"
30353043
#include "code\modules\research\message_server.dm"
30363044
#include "code\modules\research\part_replacer.dm"
3037-
#include "code\modules\research\protolathe.dm"
3038-
#include "code\modules\research\rd-readme.dm"
3039-
#include "code\modules\research\rdconsole.dm"
3040-
#include "code\modules\research\rdmachines.dm"
3041-
#include "code\modules\research\research.dm"
3045+
//#include "code\modules\research\protolathe.dm"
3046+
//#include "code\modules\research\rd-readme.dm"
3047+
//#include "code\modules\research\rdconsole.dm"
3048+
//#include "code\modules\research\rdmachines.dm"
3049+
//#include "code\modules\research\research.dm" [SIERRA-REMOVE] RND
30423050
#include "code\modules\research\server.dm"
3043-
#include "code\modules\research\designs\_designs.dm"
3051+
//#include "code\modules\research\designs\_designs.dm"
30443052
#include "code\modules\research\designs\design_aimodule.dm"
30453053
#include "code\modules\research\designs\designs_beaker.dm"
30463054
#include "code\modules\research\designs\designs_biostorage.dm"
@@ -3454,6 +3462,7 @@
34543462
#include "mods\_master_files\code\modules\power\gravitygenerator.dm"
34553463
#include "mods\_master_files\code\modules\projectiles\projectile\bullets.dm"
34563464
#include "mods\_master_files\code\modules\psionics\events\mini_spasm.dm"
3465+
#include "mods\_master_files\code\modules\psionics\psi.dm"
34573466
#include "mods\_master_files\code\modules\reagents\reagent_containers\food\snacks.dm"
34583467
#include "mods\_master_files\code\modules\species\species.dm"
34593468
#include "mods\_master_files\code\modules\species\station\adherent.dm"

‎code/__defines/MC.dm

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,28 +107,28 @@ if(Datum.is_processing) {\
107107
****/
108108

109109
/// The subsystem's Initialize() will not be called.
110-
#define SS_NO_INIT FLAG(0)
110+
#define SS_NO_INIT FLAG_01
111111

112112
/// The subsystem's fire() will not be called. This is preferable to can_fire = FALSE because it will not be added to the MC's list of active systems.
113-
#define SS_NO_FIRE FLAG(1)
113+
#define SS_NO_FIRE FLAG_02
114114

115115
/// The subsystem runs on spare CPU time, after all non-background subsystems have run that tick. Priority is considered against other SS_BACKGROUND subsystems.
116-
#define SS_BACKGROUND FLAG(2)
116+
#define SS_BACKGROUND FLAG_03
117117

118118
/// The subsystem does not tick check and should not run unless enough time can be guaranteed or it must to stay current.
119-
#define SS_NO_TICK_CHECK FLAG(3)
119+
#define SS_NO_TICK_CHECK FLAG_04
120120

121121
/// Treat the value of the subsystem's wait as ticks, not time. Forces it to run in the first tick. Implicitly has all runlevels. Ignores SS_BACKGROUND if set. Intended for systems that act like a mini-MC, like timers.
122-
#define SS_TICKER FLAG(4)
122+
#define SS_TICKER FLAG_05
123123

124124
/// Attempt to keep the subsystem's timing real-world regular by adjusting fire timing to be earlier the later it previously ran.
125-
#define SS_KEEP_TIMING FLAG(5)
125+
#define SS_KEEP_TIMING FLAG_06
126126

127127
/// Calculate the subsystem's next fire time from when it finished, not when it started.
128-
#define SS_POST_FIRE_TIMING FLAG(6)
128+
#define SS_POST_FIRE_TIMING FLAG_07
129129

130130
/// Run Shutdown() on server shutdown so the SS can finalize state.
131-
#define SS_NEEDS_SHUTDOWN FLAG(7)
131+
#define SS_NEEDS_SHUTDOWN FLAG_08
132132

133133

134134
/****

‎code/__defines/__initialization.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define INITIALIZE_HINT_LATELOAD 2 //Call LateInitialize
88
#define INITIALIZE_HINT_QDEL 3 //Call qdel on the atom
99

10-
#define ATOM_FLAG_INITIALIZED FLAG(0) // The atom has been initialized. Also see flags.dm
10+
#define ATOM_FLAG_INITIALIZED FLAG_01
1111

1212
//type and all subtypes should always call Initialize in New()
1313
#define INITIALIZE_IMMEDIATE(X) ##X/New(loc, ...){\

‎code/__defines/_renderer.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99

1010

1111
/// Main renderers are expected to always be on mobs with clients.
12-
#define RENDERER_MAIN FLAG(0)
12+
#define RENDERER_MAIN FLAG_01
1313

1414
/**
1515
* Shared renderers have a single instance and are added/removed instead of created/deleted.
1616
* Many renderers can be shared - only ones that depend on the state of the mob seeing them,
1717
* such as effects with preferences, require an owner.
1818
*/
19-
#define RENDERER_SHARED FLAG(1)
19+
#define RENDERER_SHARED FLAG_02
2020

2121
/// Renderers with non-default setup behavior in hook/startup/proc/setup_renderers.
22-
#define RENDERER_SHARED_CUSTOM FLAG(2)
22+
#define RENDERER_SHARED_CUSTOM FLAG_03
2323

2424

2525
/// The base /renderer definition and defaults.
@@ -31,7 +31,7 @@
3131
blend_mode = BLEND_OVERLAY
3232

3333
/// A bitfield of RENDERER_* defines.
34-
var/renderer_flags = EMPTY_BITFIELD
34+
var/renderer_flags = FLAGS_OFF
3535

3636
/// The compositing renderer this renderer belongs to.
3737
var/group = RENDER_GROUP_FINAL

‎code/__defines/admin.dm

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// A set of constants used to determine which type of mute an admin wishes to apply.
2-
#define MUTE_IC FLAG(0)
3-
#define MUTE_OOC FLAG(1)
4-
#define MUTE_PRAY FLAG(2)
5-
#define MUTE_ADMINHELP FLAG(3)
6-
#define MUTE_DEADCHAT FLAG(4)
7-
#define MUTE_AOOC FLAG(5)
8-
#define MUTE_ALL (~EMPTY_BITFIELD)
2+
#define MUTE_IC FLAG_01
3+
#define MUTE_OOC FLAG_02
4+
#define MUTE_PRAY FLAG_03
5+
#define MUTE_ADMINHELP FLAG_04
6+
#define MUTE_DEADCHAT FLAG_05
7+
#define MUTE_AOOC FLAG_06
8+
#define MUTE_ALL FLAGS_ON
99

1010
// Some constants for DB_Ban
1111
#define BANTYPE_PERMA 1
@@ -17,31 +17,31 @@
1717
#define ROUNDSTART_LOGOUT_REPORT_TIME 6000 // Amount of time (in deciseconds) after the rounds starts, that the player disconnect report is issued.
1818

1919
// Admin permissions.
20-
#define R_BUILDMODE FLAG(0)
21-
#define R_ADMIN FLAG(1)
22-
#define R_BAN FLAG(2)
23-
#define R_FUN FLAG(3)
24-
#define R_SERVER FLAG(4)
25-
#define R_DEBUG FLAG(5)
26-
#define R_POSSESS FLAG(6)
27-
#define R_PERMISSIONS FLAG(7)
28-
#define R_STEALTH FLAG(8)
29-
#define R_REJUVINATE FLAG(9)
30-
#define R_VAREDIT FLAG(10)
31-
#define R_SOUNDS FLAG(11)
32-
#define R_SPAWN FLAG(12)
33-
#define R_MOD FLAG(13)
20+
#define R_BUILDMODE FLAG_01
21+
#define R_ADMIN FLAG_02
22+
#define R_BAN FLAG_03
23+
#define R_FUN FLAG_04
24+
#define R_SERVER FLAG_05
25+
#define R_DEBUG FLAG_06
26+
#define R_POSSESS FLAG_07
27+
#define R_PERMISSIONS FLAG_08
28+
#define R_STEALTH FLAG_09
29+
#define R_REJUVINATE FLAG_10
30+
#define R_VAREDIT FLAG_11
31+
#define R_SOUNDS FLAG_12
32+
#define R_SPAWN FLAG_13
33+
#define R_MOD FLAG_14
3434
// [SIERRA-EDIT] - XENO WHITELIST
3535
//#define R_HOST FLAG(14) // SIERRA-EDIT - ORIGINAL
36-
#define R_XENO FLAG(14)
37-
#define R_HOST FLAG(15)
36+
#define R_XENO FLAG_15
37+
#define R_HOST FLAG_16
3838
// [SIERRA-EDIT]
3939
#define R_INVESTIGATE (R_ADMIN | R_MOD)
4040
#define R_MAXPERMISSION R_HOST
4141

42-
#define ADDANTAG_PLAYER FLAG(0) // Any player may call the add antagonist vote.
43-
#define ADDANTAG_ADMIN FLAG(1) // Any player with admin privilegies may call the add antagonist vote.
44-
#define ADDANTAG_AUTO FLAG(2) // The add antagonist vote is available as an alternative for transfer vote.
42+
#define ADDANTAG_PLAYER FLAG_01 // Any player may call the add antagonist vote.
43+
#define ADDANTAG_ADMIN FLAG_02 // Any player with admin privilegies may call the add antagonist vote.
44+
#define ADDANTAG_AUTO FLAG_03 // The add antagonist vote is available as an alternative for transfer vote.
4545

4646
#define TICKET_CLOSED 0 // Ticket has been resolved or declined
4747
#define TICKET_OPEN 1 // Ticket has been created, but not responded to

‎code/__defines/chemistry.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
#define CE_STIMULANT "stimulants" // Makes it harder to disarm someone
4545

4646
//reagent flags
47-
#define IGNORE_MOB_SIZE FLAG(0)
48-
#define AFFECTS_DEAD FLAG(1)
47+
#define IGNORE_MOB_SIZE FLAG_01
48+
#define AFFECTS_DEAD FLAG_02
4949

5050
#define HANDLE_REACTIONS(_reagents) SSchemistry.active_reagents[_reagents] = TRUE
5151
#define UNQUEUE_REACTIONS(_reagents) SSchemistry.active_reagents -= _reagents

0 commit comments

Comments
 (0)