Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Points defence #4

Merged
merged 52 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
bf757c3
upd_1
homexp13 Jul 9, 2024
66b8ea4
Merge branch 'master-RuTGMC_reborn' into game_mode
homexp13 Jul 13, 2024
3b404a6
shiza
homexp13 Jul 13, 2024
676b8e1
some new
homexp13 Jul 14, 2024
d492cc2
what
homexp13 Jul 14, 2024
0ad2467
Update code/_compile_options.dm
homexp13 Jul 16, 2024
092686b
crush respawn
homexp13 Jul 28, 2024
e3dde4c
Merge branch 'game_mode' of https://github.com/homexp13/RuTGMC-Reborn…
homexp13 Jul 28, 2024
9c9b07a
fix
homexp13 Jul 28, 2024
435f239
Merge branch 'master-RuTGMC_reborn' into game_mode
homexp13 Jul 28, 2024
6ae239e
tunel
homexp13 Jul 28, 2024
73657a3
core
homexp13 Jul 28, 2024
465c624
den
homexp13 Aug 6, 2024
003355c
testing
homexp13 Aug 6, 2024
0ad7304
Merge branch 'master-RuTGMC_reborn' into game_mode
homexp13 Aug 6, 2024
cf24fcc
ports
homexp13 Aug 13, 2024
792f130
SUBSYSTEM
homexp13 Aug 13, 2024
f2f471b
morecores
homexp13 Aug 13, 2024
182cce2
i kill
homexp13 Aug 13, 2024
3fce62d
marks
homexp13 Aug 13, 2024
e50f920
Merge branch 'master-RuTGMC_reborn' into game_mode
homexp13 Aug 13, 2024
5634b96
round_statistics
homexp13 Aug 13, 2024
a5d4273
boost_condition_sensors_amount
homexp13 Aug 13, 2024
3857118
Extra points
homexp13 Aug 13, 2024
a516601
bruh
homexp13 Aug 13, 2024
f024c66
Update code/modules/xenomorph/xeno_core.dm
homexp13 Aug 19, 2024
26169df
Update code/modules/xenomorph/xeno_core.dm
homexp13 Aug 19, 2024
f061bb9
Update code/modules/xenomorph/xeno_core.dm
homexp13 Aug 19, 2024
a39e99f
Update code/modules/xenomorph/xeno_core.dm
homexp13 Aug 19, 2024
b23cb37
Update code/modules/xenomorph/xeno_core.dm
homexp13 Aug 19, 2024
ebdc0f8
examine
homexp13 Aug 19, 2024
6e32b5e
RP moment
homexp13 Aug 19, 2024
6658e1c
undef
homexp13 Aug 19, 2024
3566643
Update code/controllers/subsystem/xeno_den.dm
homexp13 Aug 19, 2024
0518538
QDEL_LIST
homexp13 Aug 19, 2024
e8319f2
Merge branch 'game_mode' of https://github.com/homexp13/RuTGMC-Reborn…
homexp13 Aug 19, 2024
5918e96
_amount
homexp13 Aug 19, 2024
681ba9c
Update code/game/objects/machinery/telecomms/ground_telecomms.dm
homexp13 Aug 19, 2024
7bbaf1b
Update code/game/objects/machinery/telecomms/ground_telecomms.dm
homexp13 Aug 19, 2024
fabe456
xd
homexp13 Aug 19, 2024
2e299aa
Merge branch 'game_mode' of https://github.com/homexp13/RuTGMC-Reborn…
homexp13 Aug 19, 2024
298de22
Update code/game/objects/machinery/telecomms/ground_telecomms.dm
homexp13 Aug 19, 2024
92bf45a
undef
homexp13 Aug 19, 2024
27382de
Merge branch 'game_mode' of https://github.com/homexp13/RuTGMC-Reborn…
homexp13 Aug 19, 2024
8e7610f
weldingtool
homexp13 Aug 19, 2024
160efc4
aaa
homexp13 Aug 19, 2024
aa2883a
doc
homexp13 Aug 19, 2024
8913904
Merge branch 'master' into game_mode
homexp13 Aug 22, 2024
f4657e0
Update code/modules/xenomorph/tunnel.dm
homexp13 Aug 23, 2024
398cd54
Update code/modules/xenomorph/tunnel.dm
homexp13 Aug 23, 2024
608b538
Update code/modules/xenomorph/xeno_core.dm
homexp13 Aug 23, 2024
32b784f
here we go again
homexp13 Aug 23, 2024
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
15,771 changes: 15,771 additions & 0 deletions _maps/map_files/Xeno_den/Xeno_den.dmm

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions code/__DEFINES/_radio.dm
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@

#define FREQ_COMMON 1437

#define GROUND_FREQS list(FREQ_ALPHA, FREQ_BRAVO, FREQ_CHARLIE, FREQ_DELTA, FREQ_ECHO)
#define TOWER_FREQS list(FREQ_CAS, FREQ_ENGINEERING, FREQ_MEDICAL, FREQ_REQUISITIONS, FREQ_AI, FREQ_COMMAND, FREQ_COMMON)

#define MIN_FREQ 1441 // ------------------------------------------------------
// Only the 1441 to 1489 range is freely available for general conversation.
// This represents 1/8th of the available spectrum.
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/_subsystems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
#define INIT_ORDER_ICON_SMOOTHING -16
#define INIT_ORDER_LIGHTING -20
#define INIT_ORDER_SHUTTLE -21
#define INIT_ORDER_XENODEN -23
#define INIT_ORDER_PATH -50
#define INIT_ORDER_EXCAVATION -78
#define INIT_ORDER_STATPANELS -97
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/dcs/signals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#define COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND "!open_timed_shutters_xeno_hivemind"
#define COMSIG_GLOB_OPEN_TIMED_SHUTTERS_CRASH "!open_timed_shutters_crash"
#define COMSIG_GLOB_OPEN_SHUTTERS_EARLY "!open_shutters_early"
#define COMSIG_GLOB_TELETOWER "!teletower"

#define COMSIG_GLOB_TADPOLE_LAUNCHED "!tadpole_launched"
#define COMSIG_GLOB_DROPPOD_LANDED "!pod_landed"
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
#define issensorcapturegamemode(O) (istype(O, /datum/game_mode/hvh/combat_patrol/sensor_capture))
#define iscampaigngamemode(O) (istype(O, /datum/game_mode/hvh/campaign))
#define isdistressgamemode(O) (istype(O, /datum/game_mode/infestation/distress))
#define ispointsdefencegamemode(O) (istype(O, /datum/game_mode/infestation/distress/points_defence))

#define isxenoresearcharea(A) (istype(A, /area/mainship/medical/medical_science))

Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/maps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ require only minor tweaks.
#define ZTRAIT_STATION "Station"
#define ZTRAIT_RESERVED "Transit/Reserved"
#define ZTRAIT_GROUND "Ground"
#define ZTRAIT_XENO "XENO"
#define ZTRAIT_MARINE_MAIN_SHIP "Marine Main Ship"
#define ZTRAIT_DOUBLE_SHIPS "Double Marine Ship"
#define ZTRAIT_AWAY "Away"
Expand Down
3 changes: 2 additions & 1 deletion code/__DEFINES/minimap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
#define MINIMAP_FLAG_MARINE (1<<1)
#define MINIMAP_FLAG_MARINE_SOM (1<<2)
#define MINIMAP_FLAG_EXCAVATION_ZONE (1<<3)
#define MINIMAP_FLAG_UNIDENTIFIED (1<<4)
#define MINIMAP_FLAG_YAUTJA (1<<5)
#define MINIMAP_FLAG_ALL (1<<6) - 1 //RU TGMC EDIT
#define MINIMAP_FLAG_ALL (1<<6) - 1

GLOBAL_LIST_INIT(faction_to_minimap_flag, list(
FACTION_XENO = MINIMAP_FLAG_XENO,
Expand Down
5 changes: 5 additions & 0 deletions code/__DEFINES/mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
#define MODE_SILOS_SPAWN_MINIONS (1<<13)
#define MODE_ALLOW_XENO_QUICKBUILD (1<<14)
#define MODE_DISALLOW_RAILGUN (1<<15)
#define MODE_TELETOWER (1<<16)
#define MODE_XENO_DEN (1<<17)

#define MODE_INFESTATION_X_MAJOR "Xenomorph Major Victory"
#define MODE_INFESTATION_M_MAJOR "Marine Major Victory"
Expand Down Expand Up @@ -143,6 +145,9 @@
#define INFESTATION_MARINE_DEPLOYMENT 0
#define INFESTATION_MARINE_CRASHING 1
#define INFESTATION_DROPSHIP_CAPTURED_XENOS 2
#define INFESTATION_MARINE_MINOR 3
#define INFESTATION_MARINE_DEN_RUSH 4
#define INFESTATION_MARIN_RUSH_MAJOR 5

#define NUCLEAR_WAR_LARVA_POINTS_NEEDED 8
#define CRASH_LARVA_POINTS_NEEDED 10
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/game_modes.dm
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
GLOBAL_VAR_INIT(master_mode, "Nuclear War")
GLOBAL_VAR_INIT(tower_relay, FALSE)
14 changes: 14 additions & 0 deletions code/_globalvars/lists/objects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,20 @@ GLOBAL_LIST_INIT(ammo_list, init_ammo_list()) //List of all ammo types. Use

GLOBAL_LIST_EMPTY(xeno_egg_hugger)

GLOBAL_LIST_EMPTY(miners_phorone)
GLOBAL_LIST_EMPTY(miners_platinum)

GLOBAL_LIST_EMPTY(miner_phorone_locs)
GLOBAL_LIST_EMPTY(miner_platinum_locs)

GLOBAL_LIST_EMPTY(sensor_towers_infestation_ground)
GLOBAL_LIST_EMPTY(sensor_towers_infestation_caves)

GLOBAL_LIST_EMPTY(tower_relay_locs)

GLOBAL_LIST_EMPTY(xenoden_docking_ports_locs)
GLOBAL_LIST_EMPTY(xenoden_cores_locs)

GLOBAL_VAR(waves_spawner_loc)

GLOBAL_LIST_EMPTY(last_stand_nukes)
Expand Down
4 changes: 4 additions & 0 deletions code/datums/gamemodes/_game_mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,8 @@ GLOBAL_LIST_INIT(bioscan_locations, list(
parts += "[GLOB.round_statistics.larva_from_psydrain] larvas came from psydrain."
if(GLOB.round_statistics.larva_from_silo)
parts += "[GLOB.round_statistics.larva_from_silo] larvas came from silos."
if(GLOB.round_statistics.larva_from_xeno_core)
parts += "[GLOB.round_statistics.larva_from_xeno_core] larvas came from infestation towers."
if(GLOB.round_statistics.larva_from_cocoon)
parts += "[GLOB.round_statistics.larva_from_cocoon] larvas came from cocoons."
if(GLOB.round_statistics.larva_from_marine_spawning)
Expand All @@ -481,6 +483,8 @@ GLOBAL_LIST_INIT(bioscan_locations, list(
parts += "[GLOB.round_statistics.psy_shield_blasts] number of times Warlocks detonated a Psychic Shield."
if(GLOB.round_statistics.points_from_mining)
parts += "[GLOB.round_statistics.points_from_mining] requisitions points gained from mining."
if(GLOB.round_statistics.points_from_towers)
parts += "[GLOB.round_statistics.points_from_towers] requisitions points gained from infestation towers."
if(GLOB.round_statistics.points_from_research)
parts += "[GLOB.round_statistics.points_from_research] requisitions points gained from research."
if(length(GLOB.round_statistics.req_items_produced))
Expand Down
Loading
Loading