Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
269 commits
Select commit Hold shift + click to select a range
9b26724
D05M01S03
Jan 30, 2025
3c50742
D05M01S04
Jan 30, 2025
921fdbe
D05M01S05
Jan 30, 2025
9289f7c
D05M01S06
Jan 30, 2025
e6d41b0
D06M01S01
Jan 31, 2025
43671db
D06M01S02
Jan 31, 2025
894ab8e
D06M01S03
Jan 31, 2025
bfd91ae
D06M01S04
Jan 31, 2025
e5e6189
D07M01S01
Feb 1, 2025
1f99e6f
D07M01S02
Feb 1, 2025
3ae775a
D07M01S03
Feb 1, 2025
36bd84c
D07M01S04
Feb 1, 2025
57af899
D07M01S05
Feb 1, 2025
5647b31
D07M01S06
Feb 1, 2025
fa5b1be
Merge branch 'WorkMaster' into oilrig
Feb 1, 2025
769a106
D07M01S06
Feb 1, 2025
f80c25c
D07M01S07
Feb 1, 2025
3c298fa
D08M01S01
Feb 2, 2025
6c4aa99
D08M01S02:Navalis_Is_Born
Feb 2, 2025
61b8da7
D08M01S03
Feb 2, 2025
bd5f504
D08M01S04
Feb 2, 2025
98aadf3
D09M01S01
Feb 3, 2025
9767378
D09M01S02
Feb 3, 2025
71b5798
D09M01S03
Feb 3, 2025
6949a7d
D09M01S04
Feb 3, 2025
9af3ef7
D09M01S05
Feb 3, 2025
173d11f
D10M01S01
Feb 4, 2025
29dd26e
D10M01S02
Feb 4, 2025
a0da6f2
D10M01S03:Finished_First_Pass
Feb 4, 2025
2b069fb
D10M01S04
Feb 4, 2025
97f3dc6
D10M01S05
Feb 4, 2025
5aae03b
D10M01S06
Feb 4, 2025
61b023a
D10M01S07
Feb 4, 2025
582a00c
D10M01S08
Feb 4, 2025
868de0b
D10M01S09
Feb 4, 2025
39caa2f
D11M01S01
Feb 5, 2025
8c0fd10
D11M01S02
Feb 5, 2025
725e8d7
D11M01S03
Feb 5, 2025
f8dc0d1
D11M01S04
Feb 5, 2025
0d45333
D12M01S01
Feb 6, 2025
aa9d880
D12M01S02
Feb 6, 2025
462240f
D12M01S03
Feb 6, 2025
088cccb
D12M01S04
Feb 6, 2025
31a8edd
D12M01S05
Feb 6, 2025
a98e57c
D12M01S06
Feb 6, 2025
f2cba2d
D13M01S01
Feb 7, 2025
9739eac
D13M01S02
Feb 7, 2025
3b1107e
Merge branch 'master' into oilrig
Steelpoint Feb 7, 2025
1e36ce4
D13M01S03:FixMoreStuff
Feb 7, 2025
c10a59d
D13M01S03
Feb 7, 2025
77a2178
D13M01S04
Feb 7, 2025
28a4b93
D13M01S05:Runtimes
Feb 7, 2025
b1d361a
D13M01S06
Feb 7, 2025
bde0eca
D13M01S07
Feb 7, 2025
2509606
D13M01S08
Feb 7, 2025
c51dfb6
D13M01S09
Feb 7, 2025
b597342
D13M10S10:Fix
Feb 7, 2025
58cad0e
D13M01S11
Feb 7, 2025
a917160
D14M01S01
Feb 8, 2025
0820fe0
D14M01S02:Delete_Item_On_Water
Feb 8, 2025
6802454
D14M01S03
Feb 8, 2025
6475624
D14M01S04
Feb 8, 2025
3a6e266
D14M01S05
Feb 8, 2025
1dd3197
D14M01S06
Feb 8, 2025
d481e40
D15M01S01
Feb 9, 2025
c478cca
D15M01S02
Feb 9, 2025
0b5c257
D15M01S03
Feb 9, 2025
40c7fcc
D16M01S01
Feb 10, 2025
f91ff50
D16M01S02
Feb 10, 2025
a0d21d8
D17M01S01
Feb 11, 2025
6c674d4
D17M01S02
Feb 11, 2025
7d7faaf
D18M01S01
Feb 12, 2025
b59a20f
D17M01S03
Feb 12, 2025
0ebe415
D18M01S03
Feb 12, 2025
41831b9
D19M01S01
Feb 13, 2025
ffc18b3
D19M01S02
Feb 13, 2025
18a548d
D19M01S03
Feb 13, 2025
367faca
D19M01S04
Feb 13, 2025
1179a63
D19M01S05
Feb 13, 2025
f7d656f
D21M01S01
Feb 15, 2025
42ef0e1
D23M01S01
Feb 17, 2025
96182c1
D23M01S02
Feb 17, 2025
ee8e2d3
D24M01S01
Feb 18, 2025
f383aab
D25M01S01
Feb 19, 2025
16d53fb
Merge branch 'master' into oilrig
Steelpoint Feb 19, 2025
ad04450
D25M01S02
Feb 19, 2025
1a58b69
D28M01S01
Feb 22, 2025
bb6184d
D30M01S01
Feb 24, 2025
6b6dce2
NewAreasForMultiz
Feb 25, 2025
e938ef7
Morgue
Feb 26, 2025
207f49c
Merge branch 'master' into oilrig
Steelpoint Feb 26, 2025
f9ef306
FeedbackChangeOne
Feb 27, 2025
4a9ab41
ExpandingFlanks
Feb 27, 2025
2e4fc7f
SecuritySurvivalPouch
Feb 27, 2025
8acea19
MetalBalance
Feb 27, 2025
6a77af2
MoreRebalanceFromFeedback
Feb 27, 2025
f5fe5ac
ChangeToExteriorWalkways
Feb 28, 2025
5ce89fe
FirstOfficer
Feb 28, 2025
c4bd620
climbing fix
uuuuhuuuu Feb 28, 2025
f1a5412
improves return logic
uuuuhuuuu Feb 28, 2025
ef795ea
removes whiteline
uuuuhuuuu Feb 28, 2025
f484ded
Merge pull request #27 from cuberound/blocker-fix
Steelpoint Feb 28, 2025
1e89280
MultiZVersion
Feb 28, 2025
3176d4d
FixAreas
Feb 28, 2025
072365b
MoreAreaFix
Feb 28, 2025
caa0441
FinalFixPlusRebalance
Feb 28, 2025
5360000
no bonebreak from fall
uuuuhuuuu Feb 28, 2025
f6cd968
MoreFix
Feb 28, 2025
7df7a35
AnnoyingStuff
Feb 28, 2025
49cc2a8
Merge pull request #28 from cuberound/blocker-fix
Steelpoint Feb 28, 2025
615c2b7
MultizFeedbackFirstPass
Mar 1, 2025
b4eab8c
APCFix
Mar 1, 2025
42cce5b
RoofAndMoreFlanks
Mar 1, 2025
496b8ae
SingleZVersion
Mar 1, 2025
651c2af
stairs
uuuuhuuuu Mar 1, 2025
ab27a71
Merge pull request #30 from cuberound/stair-icon
Steelpoint Mar 1, 2025
6d34774
StairFixUp
Mar 2, 2025
e64e810
new icons manual placing
uuuuhuuuu Mar 2, 2025
c901da9
new icons manual placing
uuuuhuuuu Mar 2, 2025
d796098
Merge pull request #31 from cuberound/new-icons
Steelpoint Mar 2, 2025
8c09f37
eh
uuuuhuuuu Mar 2, 2025
5ebd0b9
Merge pull request #32 from cuberound/new-icons
Steelpoint Mar 2, 2025
6514b4a
MoreStairs
Mar 2, 2025
f3514e1
Merge branch 'oilrig' of https://github.com/Steelpoint/cmss13 into oi…
Mar 2, 2025
d7950af
SingleZRevision
Mar 3, 2025
be9caf4
MoreChanges
Mar 3, 2025
4b46d81
SomeQuickChanges
Mar 3, 2025
9107efa
firstpassice
Mar 3, 2025
bb5cdfc
FixTile
Mar 3, 2025
0d0f2a0
MultizChange
Mar 3, 2025
0036afe
LastSecondChange
Mar 3, 2025
4a50a19
initalupperrework
Mar 4, 2025
3fd9dbe
no autoclimb to open space
uuuuhuuuu Mar 4, 2025
4e14007
ExpandedResidentAndCharon
Mar 4, 2025
ac702bd
Merge branch 'WorkMaster' into oilrig
Mar 4, 2025
d4cfadd
Merge pull request #33 from cuberound/autoclimb-safty
Steelpoint Mar 4, 2025
02b5150
ExpandedArea
Mar 4, 2025
a90c6e9
ResiVents
Mar 4, 2025
8b4c451
MiscFixes
Mar 4, 2025
8075908
FixSecAndAreas
Mar 4, 2025
3fbeb7c
ehm
uuuuhuuuu Mar 4, 2025
edff793
sanity check
uuuuhuuuu Mar 4, 2025
5a487e8
NewSpawns
Mar 4, 2025
d1dff5b
harm intent fastfall
uuuuhuuuu Mar 4, 2025
914c95c
hmm
uuuuhuuuu Mar 4, 2025
13f7964
CustomCLFSpecOps
Mar 4, 2025
4911be6
Merge pull request #34 from cuberound/autoclimb-safty
Steelpoint Mar 4, 2025
05ea067
FurtherCLFRefinement
Mar 5, 2025
f8aea5c
FixUp
Mar 5, 2025
9799529
MapMinorChange
Mar 5, 2025
877fdde
MiscChanges
Mar 5, 2025
ded0f92
WallWeakeningMiningRig
Mar 5, 2025
5532834
missingstairicon
Mar 7, 2025
3bc5c3c
updates climbing changes
uuuuhuuuu Mar 8, 2025
8c35820
Merge pull request #35 from cuberound/updates-falling
Steelpoint Mar 8, 2025
6d9035a
fixes climbing to ocean
uuuuhuuuu Mar 9, 2025
1b4768c
heh
uuuuhuuuu Mar 9, 2025
cfa2c5c
Merge pull request #36 from cuberound/climbing-to-ocean-fix
Steelpoint Mar 9, 2025
aa72f93
DisableSingleZ
Mar 10, 2025
45fc8c9
MultizChangesFromLastTest
Mar 10, 2025
a6790f6
MinorFixes
Mar 10, 2025
ec7554d
queen powers fixed
uuuuhuuuu Mar 10, 2025
7262850
Merge pull request #37 from cuberound/queen-multiz-fix
Steelpoint Mar 11, 2025
3e198f3
MissingTile
Mar 11, 2025
ea68d83
HEAPAndNetFix
Mar 11, 2025
bb966d0
DuplicateFix
Mar 11, 2025
7b4b93f
StairUnweed
Mar 11, 2025
f6aa071
FixCLFSkills
Mar 12, 2025
49875a4
Merge branch 'WorkMaster' into oilrig
Mar 12, 2025
4e4c04c
Merge branch 'WorkMaster' into oilrig
Mar 24, 2025
f2f2b99
hostile_surv
Mar 24, 2025
34869b2
Merge branch 'master' into oilrig
Steelpoint Mar 25, 2025
e5e197b
Merge branch 'WorkMaster' into oilrig
Apr 8, 2025
249484d
FixMaybe
Apr 8, 2025
e9050c3
Merge branch 'WorkMaster' into oilrig
May 4, 2025
32cc105
Merge branch 'WorkMaster' into oilrig
May 8, 2025
f33aded
FixWeedStuff
May 8, 2025
960aa83
AllowCASResidential
May 24, 2025
e630327
Merge remote-tracking branch 'upstream/master' into oilrig
May 24, 2025
4e69908
Merge branch 'WorkMaster' into oilrig
Aug 8, 2025
5ef5c2d
FixupOldCode
Aug 8, 2025
ee6f4f7
MapRem
Aug 8, 2025
16dfadd
Fixup
Aug 8, 2025
87e14a2
CLFSpecOpsInsert
Aug 8, 2025
0064879
Merge branch 'WorkMaster' into oilrig
Aug 15, 2025
c48c7f8
Merge branch 'WorkMaster' into oilrig
Aug 16, 2025
3a112b3
Fixup
Aug 16, 2025
9054a37
MaorFix
Aug 16, 2025
2558ab8
Merge branch 'WorkMaster' into oilrig
Aug 25, 2025
ddbdfb6
Merge branch 'WorkMaster' into oilrig
Aug 25, 2025
d5055b0
Merge branch 'WorkMaster' into oilrig
Aug 28, 2025
0d56078
Fix
Aug 28, 2025
e018503
MoreFix
Aug 28, 2025
95147a6
TouchUps
Aug 29, 2025
64de5a1
ExtraAPC
Aug 29, 2025
88bd27a
Merge branch 'WorkMaster' into oilrig
Sep 10, 2025
07a99e4
Merge branch 'WorkMaster' into oilrig
Sep 21, 2025
c1aa7f4
SinglezRemoval
Sep 21, 2025
9f0a98a
AdditRemovalSingleZ
Sep 21, 2025
80f6e9f
Merge branch 'master' into oilrig
Steelpoint Sep 25, 2025
7b2a8f1
Fix
Sep 25, 2025
9035e4e
Merge branch 'WorkMaster' into oilrig
Sep 26, 2025
414aad9
Fix
Sep 26, 2025
6b03731
RogueArea
Oct 12, 2025
f32d505
AdditChanges
Oct 12, 2025
7736f51
Merge branch 'WorkMaster' into oilrig
Oct 15, 2025
203548f
Console
Oct 15, 2025
3a74eeb
FallingChange
Oct 17, 2025
a73bc94
Merge branch 'WorkMaster' into oilrig
Oct 30, 2025
ceb45f7
Fix
Nov 9, 2025
1ad47d0
remove
Nov 24, 2025
3a80996
Helm
Nov 24, 2025
6c5c4bb
SmolUpdate
Dec 9, 2025
1c37d28
Merge branch 'WorkMaster' into oilrig
Dec 28, 2025
1f179a8
Merge branch 'WorkMaster' into oilrig
Jan 19, 2026
c089122
Kot
Jan 19, 2026
a1f5586
Merge branch 'WorkMaster' into oilrig
Jan 26, 2026
2fcd1ce
PowerFix
Jan 26, 2026
9f5c55b
Whistle
Jan 26, 2026
b2bccf2
Merge branch 'WorkMaster' into oilrig
Feb 8, 2026
da470fe
Merge branch 'WorkMaster' into oilrig
Feb 17, 2026
657c834
Merge branch 'master' into oilrig
Steelpoint Feb 18, 2026
9dd2682
Merge branch 'WorkMaster' into oilrig
Feb 22, 2026
e7ddb6b
Erg
Feb 22, 2026
1cc10b1
Merge branch 'WorkMaster' into oilrig
Mar 7, 2026
c6d3c61
Fix
Mar 7, 2026
e130297
Merge branch 'WorkMaster' into oilrig
Mar 10, 2026
bd8a1b8
Merge branch 'WorkMaster' into oilrig
Mar 15, 2026
c1f2ff2
Addit
May 2, 2026
9d344f5
Merge branch 'WorkMaster' into oilrig
May 2, 2026
13dc136
Lights
May 2, 2026
db29461
FixerUp
May 3, 2026
2376393
APC
May 3, 2026
dd431a3
Addit
May 4, 2026
6ef7658
CrashLandingAndMinorFix
May 6, 2026
36a09e0
Fixer
May 6, 2026
0186fa9
Merge branch 'WorkMaster' into oilrig
May 10, 2026
bf561cb
Merge branch 'WorkMaster' into oilrig
May 17, 2026
298397b
Flammer
May 25, 2026
175bd0e
Update
Jun 1, 2026
5872b37
nightmare
Jun 1, 2026
ed12f5a
MIAShuttle
Jun 1, 2026
928450b
Flooring
Jun 2, 2026
dba3830
Merge branch 'WorkMaster' into oilrig
Jun 2, 2026
2b9b4f7
Merge branch 'WorkMaster' into oilrig
Jun 2, 2026
3253f2b
Merge branch 'WorkMaster' into oilrig
Jun 3, 2026
0f09995
Addit
Jun 3, 2026
8b51a00
Floor
Jun 4, 2026
e088c65
Merge branch 'master' into oilrig
Jun 6, 2026
f87cdce
Merge branch 'master' into oilrig
Jun 24, 2026
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
1 change: 1 addition & 0 deletions code/__DEFINES/__game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
#define MAP_TYRARGO_RIFT "Tyrargo Rift"
#define MAP_WHITE_ANTRE_RESEARCH_FACILITY "White Antre Research Facility"
#define MAP_NAVALIS "Navalis Platform 13"//multiz version
#define MAP_CHINOOK "Chinook 91 GSO" //admin level
#define MAP_ROSTOCK "SSV Rostock" //UPP Warship
#define MAP_HUNTERSHIP "Hunter Ship"
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
#define AREA_NOTUNNEL (1<<9)
/// Flags the area as heavily ventilated clearing most /obj/effect/particle_effect in a few ticks.
#define AREA_HEAVILY_VENTILATED (1<<10)
/// Flags the area as not being a valid location for a para-drop to land on..
#define AREA_NO_PARA (1<<11)

/// Default number of ticks for do_after
#define DA_DEFAULT_NUM_TICKS 5
Expand Down
1 change: 1 addition & 0 deletions code/_globalvars/bitfields.dm
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ DEFINE_BITFIELD(flags_area, list(
"AREA_YAUTJA_HUNTING_GROUNDS" = AREA_YAUTJA_HUNTING_GROUNDS,
"AREA_YAUTJA_HANGABLE" = AREA_YAUTJA_HANGABLE,
"AREA_NOSECURECADES" = AREA_NOSECURECADES,
"AREA_NO_PARA" = AREA_NO_PARA
))

DEFINE_BITFIELD(disabilities, list(
Expand Down
38 changes: 38 additions & 0 deletions code/datums/weather/weather_events/navalis_platform_13.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/datum/weather_event/light_rain
name = "Tropical Storm"
display_name = "Tropical Storm"
length = 4 MINUTES
fullscreen_type = /atom/movable/screen/fullscreen/weather/low

turf_overlay_icon_state = "strata_storm"
turf_overlay_alpha = 40

effect_message = null
damage_per_tick = 0

has_process = TRUE
lightning_chance = 1

ambience = 'sound/ambience/rainforest.ogg'

fire_smothering_strength = 1

/datum/weather_event/monsoon
name = "Monsoon Warning"
display_name = "Monsoon Warning"
length = 6 MINUTES
fullscreen_type = /atom/movable/screen/fullscreen/weather/high

turf_overlay_icon_state = "strata_storm"
turf_overlay_alpha = 115

effect_message = null
damage_per_tick = 0


ambience = 'sound/ambience/varadero_storm.ogg'

has_process = TRUE
lightning_chance = 6

fire_smothering_strength = 4
20 changes: 20 additions & 0 deletions code/datums/weather/weather_map_holders/navalis_platform_13.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/datum/weather_ss_map_holder/navalis_platform_13
name = "Navalis Map Holder"

warn_time = 1 MINUTES
min_time_between_events = 30 MINUTES
min_time_between_checks = 0
min_check_variance = 0

no_weather_turf_icon_state = "strata_clearsky"

potential_weather_events = list(
/datum/weather_event/light_rain,
/datum/weather_event/monsoon,
)

/datum/weather_ss_map_holder/navalis_platform_13/should_affect_area(area/A)
return !CEILING_IS_PROTECTED(A.ceiling, CEILING_GLASS)

/datum/weather_ss_map_holder/navalis_platform_13/should_start_event()
return TRUE
Loading