Kashargul and GitHub
d3b7ba8b43
next new to init ( #17400 )
...
* next new to init
* .
* this needs thorough testing
* .
* needs an istype
* also vnotice
* mvoe to defines
2025-03-24 06:18:39 -04:00
9f124e5b14
Tooling Update and Maplint Port ( #17199 )
...
* Initial
* Remove corrupt dmis
* Fixup maps in TGM format
4e5a32721f : maps/_templates_and_guidance/Public Event Templates/Maze_Reward_-_Copy.dmm
4e5a32721f : maps/_templates_and_guidance/Templates/shelter_Medical.dmm
4e5a32721f : maps/expedition_vr/aerostat/aerostat.dmm
4e5a32721f : maps/expedition_vr/aerostat/aerostat_science_outpost.dmm
4e5a32721f : maps/expedition_vr/beach/submaps/deadBeacon.dmm
4e5a32721f : maps/expedition_vr/wild/tether_wild-crash-alt.dmm
4e5a32721f : maps/expedition_vr/wild/tether_wild-crash.dmm
4e5a32721f : maps/expedition_vr/wild/tether_wild-surface.dmm
4e5a32721f : maps/expedition_vr/wild/tether_wild-temple.dmm
4e5a32721f : maps/gateway_vr/lucky_7.dmm
4e5a32721f : maps/gateway_vr/snow_outpost.dmm
4e5a32721f : maps/overmap/_map.dmm
4e5a32721f : maps/overmap/bearcat/bearcat.dmm
4e5a32721f : maps/overmap/example_sector1.dmm
4e5a32721f : maps/overmap/example_sector2.dmm
4e5a32721f : maps/redgate/falls/falls.dmm
4e5a32721f : maps/submaps/pois_vr/aerostat/CaveS.dmm
4e5a32721f : maps/submaps/pois_vr/aerostat/DeadSettlers1.dmm
4e5a32721f : maps/submaps/pois_vr/aerostat/DeadSettlers2.dmm
4e5a32721f : maps/submaps/pois_vr/aerostat/DoomP.dmm
4e5a32721f : maps/submaps/pois_vr/aerostat/Lab1.dmm
4e5a32721f : maps/submaps/pois_vr/aerostat/Rockybase.dmm
4e5a32721f : maps/submaps/pois_vr/debris_field/debris14.dmm
4e5a32721f : maps/submaps/pois_vr/debris_field/derelict.dmm
4e5a32721f : maps/submaps/pois_vr/debris_field/new_escapepod_xeno.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/BlastMine1.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/CaveTrench.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/Cavelake.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/Cliff1.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/Geyser1.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/Geyser2.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/Geyser3.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/Mineshaft1.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/Scave1.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/SupplyDrop1.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/crashed_ufo.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/crashed_ufo_frigate.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/crystal1.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/crystal2.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/crystal3.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/deadBeacon.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/deadly_rabbit_vr.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/deadspy.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/digsite.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/excavation1.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/lava_trench.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/prepper1.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/ritual.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/spatial_anomaly.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/speakeasy_vr.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/vault1.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/vault2.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/vault3.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/vault4.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/vault5.dmm
4e5a32721f : maps/submaps/surface_submaps/mountains/vault6.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/Boathouse.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/BuriedTreasure.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/BuriedTreasure2.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/BuriedTreasure3.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/Oldhouse.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/PooledR.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/Rocky5.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/Shakden.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/Thiefc.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/beacons.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/chemspill1.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/farm1.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/house1.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/lonehome.dmm
4e5a32721f : maps/submaps/surface_submaps/plains/smol2.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Blueshuttledown.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Boombase.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/CaveS.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Chapel.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Cragzone1.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/DJOutpost2.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/DJOutpost3.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/DJOutpost4.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/DoomP.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Drugden.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Epod3.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Epod4.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Flake.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/MCamp1.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/MHR.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Manor1.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Mudpit.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Rocky1.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Rocky3.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Rocky4.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Rockybase.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Shack1.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Shelter.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Smol1.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/Snowrock1.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/borglab.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/butchershack.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/chasm.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/chemspill2.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/deathden.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/derelictengine.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/frostoasis.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/kururakden.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/spider1.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/wolfden.dmm
4e5a32721f : maps/submaps/surface_submaps/wilderness/xenohive.dmm
4e5a32721f : maps/tether/tether-02-surface2.dmm
4e5a32721f : maps/virgo_minitest/virgo_minitest-sector-2.dmm
Automatically commited by: tools\mapmerge2\fixup.py
* Remove unnecessary whitespace edits from mapmerger
* Cable dirs update path
* Fix area var edits
* Put the area over there
* Ignore archive maps folder
* Forgot to port multivar support too
* A few changes I forgot about for hook install
* restore multivar support that chomp doesn't have yet
* ban those
* Forgot to add code for the marker too
* Couple more of these invalid cables were added in master
* Update multiple_blood_effects.yml
* Update multiple_blood_effects.yml
* Fixup maps in TGM format
612ca9cbb9 : maps/tether/submaps/tether_misc.dmm
Automatically commited by: tools\mapmerge2\fixup.py
* Fixup now logs the map its currently checking
* Final fixes?
* Fixup maps in TGM format
3078e5cd0a : maps/expedition_vr/beach/submaps/crashedcontainmentshuttle.dmm
3078e5cd0a : maps/redgate/fantasy_dungeon.dmm
3078e5cd0a : maps/submaps/pois_vr/aerostat/Rockybase.dmm
3078e5cd0a : maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle_vr.dmm
3078e5cd0a : maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm
3078e5cd0a : maps/submaps/surface_submaps/plains/dogbase.dmm
3078e5cd0a : maps/submaps/surface_submaps/plains/greatwolfden.dmm
3078e5cd0a : maps/submaps/surface_submaps/plains/lonehome_vr.dmm
3078e5cd0a : maps/submaps/surface_submaps/plains/methlab.dmm
3078e5cd0a : maps/submaps/surface_submaps/plains/oldhotel.dmm
3078e5cd0a : maps/submaps/surface_submaps/plains/priderock.dmm
3078e5cd0a : maps/submaps/surface_submaps/wilderness/Rockybase.dmm
3078e5cd0a : maps/submaps/surface_submaps/wilderness/demonpool.dmm
3078e5cd0a : maps/submaps/surface_submaps/wilderness/dogbase.dmm
3078e5cd0a : maps/submaps/surface_submaps/wilderness/greatwolfden.dmm
3078e5cd0a : maps/tether/submaps/underdark_pois/abandonded_outpost.dmm
3078e5cd0a : maps/tether/submaps/underdark_pois/phoron_rat_den.dmm
Automatically commited by: tools\mapmerge2\fixup.py
* Fix tether_misc error
* Remap reused solar farm area
* Fix erroneous bearcat entries
* Fix weird whitespace (most archive maps also affected but didn't bother)
* misc mdb cleanup
* moar
* grr
---------
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
Co-authored-by: Cameron Lennox <killer65311@gmail.com >
2025-03-16 01:06:55 +01:00
0114e94239
Map adjustments [MDB IGNORE] ( #17342 )
...
* Fixes Blackshuttledown.dmm
* Fixes Blueshuttledown.dmm
* Update Blueshuttledown.dmm
* Blackshuttledown.dmm
* aerostat
* Update aerostat_science_outpost.dmm
* Update Maze_Reward_-_Copy.dmm
* Update talon_v2.dmm
* Update mercenarybase.dmm
* Update vespa.dmm
* Update mercship.dmm
* Update gecko_sh.dmm
* Update eggnogtown.dmm
* Update virgo_minitest-1.dmm
* Update zoo_b.dmm
* Update snow_outpost.dmm
* Update zoo.dmm
* Update tether-03-surface3.dmm
* Update tether-02-surface2.dmm
* regexing
---------
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2025-03-14 08:24:32 -04:00
SatinIsle and GitHub
1bb329a5f5
Fixes duplicate structures or cleanables on maps ( #17330 )
...
* Fixes duplicate structures or cleanables on maps
Fixed a number of duplicate structures and cleanables on maps for the map linter PR. I will need the linter to be re-run once this is merges so that I can clean up what's left over easier.
* Fixed more that were actually triplicates
2025-03-13 22:18:50 +01:00
Drathek and GitHub
196bbd28e9
Refactor hardcoded lateloaded map define zs ( #17290 )
...
* Refactor hardcoded lateloaded map define zs to use a GLOB list instead
* Refactor groundbase wilds loading
* new to init docking codes
* fix space whales excessive deleting
* update comment
* Forgot some aliases
* How is this now a missing turf
Remove duplicate turf
2025-03-09 14:06:25 -04:00
Kashargul and GitHub
46bea7cfa2
Initialize fixing ( #17279 )
...
* Initialoize fixing
* diff fix
* add init grep test
* fixed missed ones
* .
* some more
* ,
2025-03-08 13:59:29 -05:00
Kashargul and GitHub
9d688b7a7c
Some more Init and Destroy issues ( #17252 )
...
* moreInitandDestroy
* .
* oups
* .
* .
* fix?
* oups
* clean this up
* fix those dels
* ...
* fix
* ummm
* reworks resource handling
* .
* .
2025-03-06 01:53:52 +01:00
SatinIsle and GitHub
53e95e0ece
Fixes more map issues ( #17225 )
...
* Fixes more map issues
Fixed duplicate APCs in the same area on station maps.
Fixed redgate ladders that allowed upwards movement without having a z-level above.
* More fixes
More map fixes, moved bearcat example and avii_eventMapv2 to archive because they're too broken to spend time on.
* Bunch more map fixes
2025-03-05 16:14:53 +01:00
3e46e16e8c
Simultaneous map definitions ( #16924 )
...
* initial
* Update file pathing
* Fix dup vars
* Move shuttle datums around
* Why am I fixing pdas
---------
Co-authored-by: Cameron Lennox <killer65311@gmail.com >
2025-03-03 17:25:45 -05:00
f9e7b44dae
cleans up INIT ( #17130 )
...
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
2025-02-13 23:28:01 +01:00
Drulikar
4d0c9f9a98
Merge remote-tracking branch 'upstream/master' into fix_minimap_renderer
2025-01-11 23:45:05 -06:00
C.L.
0775881d4c
Fixes missing grass texture on DC.dmm
2025-01-11 15:03:14 -05:00
C.L.
8abffc64fb
Fixes missing turf
...
Fixes missing turf on wizard.dmm
2025-01-11 14:52:17 -05:00
Drulikar
ac8f3d5dd0
Fixes
2025-01-07 06:52:06 -06:00
SatinIsle
59c179bfb9
Missing engine submap files
2025-01-07 11:08:55 +00:00
SatinIsle
be7d642799
Archives old map files
...
Changed the directory of many older, unmaintained and unused map files (particularly those from Polaris) to archive/map. This will prevent them from being linted by upcoming changes and causing the lint to fail.
I have not touched the maps in surface_submaps/plains,mountain or wilderness. I know that the plains ones are largely still used on the tether, and am uncertain about the others.
Fixed a few maps (ships and POIs) with missing objects.
2025-01-07 11:02:59 +00:00
Kashargul and GitHub
7c7666d670
fix a lot of map issues ( #16857 )
...
* fix a lot of map issues
* fix SM template...
2025-01-06 18:57:52 +01:00
Kashargul and GitHub
819ff4301f
wipes out all cell map edits ( #16727 )
2024-12-18 20:26:44 +10:00
Kashargul and GitHub
939fcbb488
Merge branch 'master' into reagentToDefines
2024-12-06 21:57:14 +01:00
Kashargul
80edcd2c3d
Converts gas, mat and reagent strings to defines
2024-12-06 17:26:00 +01:00
Kashargul
ead0180057
converts area vars to flags
2024-12-04 22:21:38 +01:00
Killian
5c81b06c74
space ghost and mining spawn tweaks
2024-11-28 23:33:43 +00:00
Heroman3003 and GitHub
6074915f29
Merge pull request #16652 from SatinIsle/fix-edge
...
Fix Two active edges
2024-11-28 14:41:14 +10:00
SatinIsle
a112a2c21e
Update ship_tanker_betrayed.dmm
2024-11-28 00:15:35 +00:00
SatinIsle
e00a4c0aa5
Found another in the debris field
2024-11-28 00:06:08 +00:00
SatinIsle
88ec19886f
Fix one active edge
...
Fixes an active edge in the plain POI "oldhotel"
2024-11-27 23:58:39 +00:00
Kashargul
9907b41817
some accessories
2024-11-17 23:50:10 +01:00
Killian
e6eb45f910
Merge remote-tracking branch 'upstream/master' into kk-rings
2024-11-08 10:50:04 +00:00
Killian
9fff34e6ad
attachable knuckledusters and force transfer
2024-11-07 03:06:56 +00:00
2c11b12814
Headset Refactor and Selection ( #16568 )
...
* headset refactor and selection
* Update headset.dm
formatting
* Update code/modules/client/preference_setup/general/04_equipment.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
* Update code/_helpers/global_lists.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
* Update code/modules/client/preference_setup/general/04_equipment.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
* Update code/modules/client/preference_setup/general/04_equipment.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
* Update code/modules/client/preference_setup/general/04_equipment.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
* Update code/modules/client/preference_setup/general/04_equipment.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
---------
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
2024-11-06 18:49:11 +01:00
Killian
555ef76197
Update drgnplateu.dmm
2024-10-29 01:09:42 +00:00
ShadowLarkens and GitHub
a8affbd4ae
Add bapi-dmm to reduce startup time by... a lot ( #16148 )
...
* Add bapi-dmm, a rust maploader that goes BRRRRRRR
* A few more maps switched away from file paths
* Update to include 48f4879d8704cb057a (better path error handling)
2024-10-26 13:32:41 +02:00
242fa3a66b
Ports over configuration controller ( #16484 )
...
* Ports over configuration controller
* Fixes
* Manual path fix
* patch (#16490 )
* patch
* .
* SQL Fix
* Post-rebase fix
* Added missing examples
---------
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2024-10-22 19:26:44 +02:00
Kashargul
a2c673ab7a
refactors most spans
2024-10-02 21:10:31 +02:00
Kashargul
e0d694e8ac
rid of old span macros
2024-10-01 23:51:48 +02:00
Heroman3003 and GitHub
5260e2cfda
Merge pull request #16360 from ShadowLarkens/mapci
...
Make map selection marginally better and more CI friendly
2024-09-29 19:25:13 +10:00
Guti
f2d6e7c639
Damn recording tapes
2024-09-29 00:14:13 +02:00
ShadowLarkens
d32600b0bf
Make map selection marginally better and more CI friendly
2024-09-23 18:58:38 -07:00
Guti
f4f5476121
Merge branch 'master' into weapon-removal
2024-09-18 18:07:43 +02:00
Kashargul
8a90ae6523
only missing alt titles
2024-09-12 22:48:14 +02:00
Kashargul
8a3520e2e0
move all factions to defines
2024-09-12 20:17:41 +02:00
Guti
409aaba802
Remove
2024-09-09 02:36:53 +02:00
Killian and GitHub
ef06ade4c2
Research Samples ( #16039 )
...
* added research samples
* added research sample pois
* added research samples
remove placeholder tier icons, touch up the base placeholder icon, and replace the spawner icons
also adjusted the common/uncommon/rare spawner weights slightly
2024-08-26 05:20:54 +10:00
Novacat and GitHub
2c796c4010
Adminbus and Shelter Capsule Updates ( #16191 )
...
* Adminbus and Shelter Capsule Updates
- Adds weapon cell boxes, which contain 7 weapon cells. For now adminbus only.
- ERT Ship gets a couple denecrotizers, reinforced insulated gloves, weapon cell boxes, and a minor bugfix
- Updated an adminbus deployable dropship
- Updated uplinks with reinforced insulated gloves and weapon cell boxes
- Fixes a load error with Ascian's shelter capsule, adds a missing health analyzer
- Adds Survival Watch and Emergency Beacon to Luxury Shelter Capsule and Ascian's Shelter capsule
- Replaces Escape Pod shelter capsule in the Curious Coin trader with a Frontier Translocator
* Fixes accidental double commas
* Casino spawner nade adjustments
* Buffs the Dropship's SMES
* Updates Shelter capsule medical supplies
2024-08-18 20:40:36 +10:00
Drathek and GitHub
7c8bb85de3
Whitespace Standardization [MDB IGNORE] ( #15748 )
...
* Update settings
* Whitespace changes
* Comment out merger hooks in gitattributes
Corrupt maps would have to be resolved in repo before hooks could be updated
* Revert "Whitespace changes"
This reverts commit afbdd1d844 .
* Whitespace again minus example
* Gitignore example changelog
* Restore changelog merge setting
* Keep older dmi hook attribute until hooks can be updated
* update vscode settings too
* Renormalize remaining
* Revert "Gitignore example changelog"
This reverts commit de22ad375d .
* Attempt to normalize example.yml (and another file I guess)
* Try again
2024-02-20 11:28:51 +01:00
Wulf
cb0e482878
error fix
2023-10-23 23:33:49 -05:00
Wulf
e8917400f1
Adds atmos to science
...
I forgor to add it there
2023-10-23 23:32:43 -05:00
Wulf
4911f92588
Adds PIPES and VENTS
...
Adds pipes and vents in maints, as well as air alarms.
2023-10-23 19:10:01 -05:00
Wulf
53be50c1a1
Fixed airlock name error
...
As the summary says.
2023-10-23 18:18:53 -05:00
Wulf
786589ea99
Avii's Borg Event Map
...
As the title says. I discussed it with them, they said the map works perfectly for their event and wanted me to add it to our code that way they and other gamemasters can use it in their events!
2023-10-21 21:34:11 -05:00