103 Commits
Author SHA1 Message Date
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
KashargulandGitHub 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
SatinIsleandGitHub 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
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 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
KashargulandGitHub 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
KashargulandGitHub 819ff4301f wipes out all cell map edits (#16727) 2024-12-18 20:26:44 +10:00
Kashargul ead0180057 converts area vars to flags 2024-12-04 22:21:38 +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
ShadowLarkensandGitHub 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
Heroman3003andGitHub 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
ShadowLarkens d32600b0bf Make map selection marginally better and more CI friendly 2024-09-23 18:58:38 -07:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
NovacatandGitHub 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
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
SatinIsle 67e094d605 New Mob: Scel
Added a new mob, Scel, created by Kira72.
Comes in 5 different colours. This mob is relatively rare in random mob spawners. It's a retaliate mob with a detailed belly. It looks like a snake-like creature with black flesh and neon liquid visible beneath patches of it. When attacking, it has a 50/50 chance of using a special attack of either a tongue grab or lunge. Added to the maint pred options too.

Fixed a missing item in Rain City.

Added a new admin spawn map which is literally just the Rascal's Pass shuttle in space.

Removed the great wolf catalogue entry from the crypt drake.
2023-10-06 22:18:45 +01:00
VerySoft 56f09ebffa More wires! 2023-09-12 03:22:01 -04:00
Runa Dacino 1b23ff5cdc tweak: Replaces "Iron" pill bottle with blood regen pill bottle
Replaces instances of "iron" pill bottle with the new blood regen pill bottle in containers and maps that are either NanoTrasen or Zorren related. Keeps iron bottles in other maps (mostly specific away mission rewards)

add: Adds Copper pills, Blood regen pill bottles

30 u copper reagent per copper pill. Blood regen contains 9 iron, 5 copper pills now that zorren need copper for treatment
2023-09-10 16:45:26 +02:00
Heroman 347d44d05c Two small fixes 2023-08-27 11:41:12 +10:00
Heroman dfa0edc6da Fixes entertainment monitor icons missing on some maps 2023-08-13 08:24:22 +10:00
Runa Dacino ecf3c7cf30 Adds: Overmap ship capable of docking with SD
Adds a new overmap shuttle capable of docking with the SD for event use.

It is somewhat barebones, containing only the necessary machinery so that it may fly around, relying on the GM to decorate it proper.
2023-07-30 17:10:08 +02:00
Runa Dacino 1e6963759f Replaces deprecated virology paths in map files with new one
* Fixes https://github.com/VOREStation/VOREStation/issues/14952
2023-06-03 14:36:39 +02:00
Killian 83f107825d Update ert.dmm 2023-02-23 06:38:01 +00:00
Killian 83e22477f3 von braun updates
added brig, shuffled some stuff around, renamed a thing or two
2023-02-23 02:42:22 +00:00
Unknown a2b74cf590 Miscellaneous tweaks
- Swaps advanced health analyzers for phasic ones in some event zones (mostly ERT/CC)
- Removes the listening_level var from preset relays
2022-12-30 15:29:28 -05:00
Unknown 90effc3caf Fixes some Oversights
- Removes Phasers from cargo ordering
- Removes weapons and combat armor from Talon
- Renames access_awayteam back to access_explorer for compatibility reasons
- Standardizes the itempath of the buffer device across all three maps.
2022-12-23 19:25:47 -05:00
Killian 33efd08ddb talon, vb, and typhon fixes 2022-10-12 13:25:58 +01:00
Heroman 0cdf348599 Adds map template for the casino 2022-08-25 13:43:30 +10:00
Heroman 5da5265461 Post-test fixes for casino 2022-08-21 14:27:33 +10:00
Heroman 5876c365db More casino updates 2022-08-20 16:18:06 +10:00
Heroman e70731d417 ALL runtimes
ALL runtimes
2022-06-23 18:48:28 +10:00
VerySoft bb6ed41118 Makes new pAI obtainable
Also adds teppi pAI
2022-06-04 15:30:20 -04:00
VerySoft 2a96f20ce4 Replaces ammo boxes in maps
>:C If you gonna refactor things pls make sure you actually replace the things on -all- the maps we use. = w=
2022-03-08 05:33:19 -05:00
Unknown cd039869c2 Hastily gives the ERT their suits back
A previous update removed all the ERT's voidsuits and hardsuits. Probably not intentional.
2022-02-07 14:53:55 -05:00
Unknown 63d18c53f7 Part two of standardization 2021-12-06 23:59:06 -05:00
Unknown 8020c334cc Fixes the ERT Ship
Also fixes some other special maps for admin use.
2021-12-06 23:21:13 -05:00
VerySoft f2164827b4 The final updates
Adds a new random spawner for coins with a fail chance (so the coins aren't always in the same place)

Addsome missing vending machines to the random vending machine spawner 

Adds a sound to starting and stopping in ships (that only plays at most once every 10 seconds.)

And sets it up so that planets and ships can have a sound when visited.

A bunch of little map tweaks to polish things up!
2021-10-29 02:29:42 -04:00
VerySoft 81824e692f Miscellaneous updates
makes it so some areas aren't required to be mapped in for unit tests

Area!


Attempt to fix active edge


Add/update planet art


Telecomms airlock fixed


Fixes the starstuff

now it brings both areas with it
Admin fluff

Some stuff for helping events happen, also makes the bluespace and redspace shimmers have a skybox icon
2021-10-27 19:55:53 -04:00
Killian 4b32da920f fix salamanders and wall-lockers 2021-08-12 20:29:34 +01:00