Commit Graph

72 Commits

Author SHA1 Message Date
Cameron Lennox fd0a7cfffd Fixes map issues found in #18285 [MDB IGNORE] [IDB IGNORE] (#18289)
* Fixes Hybridshuttle

* Update aro2.dmm

* Update aro.dmm

* Update aro3.dmm

* Update lunaship.dmm

* Tether surface1

* Tether Centcomm

* tether misc

* otieshelter

* methlab

* drgn and otie

* derelectengine

* drgnplateu

* old_teleporter

* tinycarrier

* ship_mining_drone

* Dhael

* dojo

* skipjack

* example_sector

* exmple_sector2

* v5_outpost

* tether_wild_surface

* wild_temple

* Update tether_wild-crash-alt.dmm

* wild-crash

* Update gb-z2.dmm

* GB

* Update ship_centcom.dmm

* Update stellar_delight1.dmm

* Zoo

* Update zoo_b.dmm

* Update innland.dmm

* dungeon

* cybercity

* train.dmm

* Fixup maps in TGM format

716c939e8e: maps/gateway_vr/zoo.dmm
716c939e8e: maps/submaps/pois_vr/debris_field/ship_mining_drone.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* fixup

* fix these

* Incorporate this

* Update this
2025-08-22 00:18:08 +02:00
Drathek 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
Kashargul 0bf3af4147 Turfsuff (#17310)
* end of file Fix

* fix those lints too

* .

* implements the falling to turfs

* move to the right planet

* use turf proc for effect

* just some types

* .

* .

* .

* .

* .

* .

* .

* revert
2025-03-11 20:27:06 -04:00
SatinIsle a7e92bbd52 Dorm privacy switch and station map fixes (#17217)
* Dorm privacy switch and station map fixes

Added privacy switches to all dorm rooms, these buttons make an overlay appear on the room for ghosts preventing them seeing inside. This does not currently prevent them hearing emotes from inside the room, it's purely a visual block.

Fixed station maps for the map linter PR, still have many more to do but those are out of the scope of this PR, just wanted to tick these ones off whilst I'm editing the maps anyway.

* Also adds an air alarm to the atmos breakroom
2025-02-26 18:34:22 +01:00
Kashargul e88ba26a8a Fixes up some more icon and map issues [MDB Ignore] (#16914)
* Fixes up some more icon and map issues

* change those
2025-01-25 11:16:14 -05:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
Heroman 0aa925be1f Fixes boxing ropes (bottom) and boxing turnbuckle not blocking properly 2023-01-22 13:48:03 +10:00
VerySoft 26288ff9cf Some final tweaks
Just tidies up a few wires, makes sure tether and SD are ready to be run with some of the new changes to CC and misc

also moves the inside program out of restricted for holodeck
2022-04-09 16:30:09 -04:00
VerySoft b31ee089ac GB Update
New stuff!
2022-04-04 13:38:08 -04:00
VerySoft a4cdc80f8c Stellar delight map files
Files for the stellar delight to work probably
there are also some edits to tether and other misc files for the purpose of making things work with multiple maps
CREMATORIUM NO GET TAG
2021-10-27 19:52:39 -04:00
VerySoft e3c5d78c2b Fixxes tram doors
It's been broken for days I am surprised no one reported it.
2021-08-17 23:01:08 -04:00
Ghost Actual d963833121 Orange Line Upgrade (#11391)
* Base Commit

* Secondary Commit

* Small Fix

* (Hopefully) Final Commit
2021-08-13 11:39:46 -04:00
Detective Google 69b0c42527 re-adds wallflower space to the tram 2021-08-08 23:27:25 -05:00
Aronai Sieyes b05364e3ab Actual fancy shuttles 2021-08-04 17:17:04 -04:00
Aronai Sieyes ede915e5f5 Sanitize tether maps from re-default vars 2021-07-29 00:15:31 -04:00
VerySoft 48a218da1b More maptweaks
Fixxes an issue and tweaks a few things!
2021-07-05 23:50:16 -04:00
Killian 730468d770 Update tether_misc.dmm 2021-04-05 06:09:35 +01:00
Killian 02b93082ef tram+station take 2 2021-04-05 06:06:45 +01:00
VerySoft 191c59aad7 double checks 2021-03-29 23:22:31 -04:00
VerySoft b0a8109f55 OM edge tweak
Some of the overmap edges weren't edges, so ships can just fly out of the overmap and get into trouble! So I ran over all the edges to make sure there aren't any unaccounted for.
2021-03-29 23:14:21 -04:00
Unknown c061ad6a83 Fixes CC Telecomms 2021-03-29 13:01:13 -04:00
Unknown aebb675ba1 Fixes bug 2021-03-28 18:52:02 -04:00
Unknown b8e0b503fe DMMTGM 2021-03-28 17:39:16 -04:00
Unknown 8b8b949d5f Adminbus area modifications 2021-03-28 17:35:55 -04:00
H0lySquirr3l c38a6ff360 Add files via upload 2021-03-22 21:23:19 -05:00
H0lySquirr3l cd56cc5f2f Add files via upload 2021-03-19 17:22:27 -05:00
H0lySquirr3l 9c9fb9e8a0 Add files via upload 2021-03-06 12:08:23 -06:00
VerySoft 90bc607699 Moves the tram station and updates the tram's wall type
tram is titanium hull now and the tram station expansion is moved north so it doesn't cover the cafe's windows
2021-02-02 11:24:17 -05:00
Detective Google 52eef9c86d replaces the tram with the big tram 2021-01-05 15:57:07 -06:00
Unknown 8512f454d3 Fixes some Telecomms stuff
- Allinones now work
- Adds a special ERT allinone for ERT comms
- Fixes comms interception for Antags
2020-12-04 20:13:08 -05:00
Unknown f6fc13003b Balance fixes and bugfixes
- Adjusts some of the contents of the ERT ship.
- Fixes mercenary coms not working
- Hopefully! Fixes antag coms not working
- Fixes uplinks not deducting telecrystals when things are bought
2020-11-14 12:20:46 -05:00
Leshana 9fee9daafc Copied chessboard holodeck source to tether map. 2020-06-26 19:47:38 -04:00
Rykka 7def496a09 Fix tether_misc.dmm
Forgot mapmerge
2020-05-10 13:19:37 -04:00
Rykka 3b3a7b960c Add Picture-in-Picture Mode for AI's, Working on Resolving Runtime
WIP DESC
2020-05-10 12:31:49 -04:00
Unknown 74d3b04ddf Tweaks adminbus areas 2020-04-30 10:03:04 -04:00
Unknown fb40ceb428 Cleans up Tether misc
Mostly just moves stuff around and makes it a bit more organized. Leaves a lot of open space for future stuff.
2020-04-27 21:48:27 -04:00
TheFurryFeline e6606e5a0d Semi-Final Touches
Current issues: 3 different runtimes related to the new shuttle, console won't connect to shuttle. More to work on tomorrow. Deleting the surplus files now. Mapmerge run, too.
2020-04-15 16:22:04 -04:00
H0lySquirr3l 5bc18c4c96 Replace ring in holo boxing ring with actual ring. (#7209)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Delete fitness_vr.dmi

* Add files via upload
2020-04-13 09:33:22 -04:00
Aronai Sieyes 75555e688f VS: Tether changes for telecomms update 2020-04-11 12:03:10 -04:00
Aronai Sieyes 883f718121 Fix escape shuttle landmark 2020-04-03 12:19:41 -04:00
Aronai Sieyes 6b0ebc79a6 VS: Collapse tether_ships into tether_misc 2020-04-02 01:08:07 -04:00
Aronai Sieyes 2c761ec367 Extra overmaps for adminbuse and bluespace rifts 2020-03-27 17:25:16 -04:00
Novacat 169d40a3b7 Merge pull request #6963 from TheFurryFeline/TFF-Soft's_Holodeck_Move
[Map] Soft's Holodeck Move
2020-03-26 12:56:41 -04:00
Unknown 3da84a477b Some Adminbus Fixes
- Fixes Cruiser not having scrubbers/vents mapped in to some areas
- Reconfigures Cruiser fighterbay, has 8 fighters now.
- Fixes path issue for Cruiser and KHI vessels
- Moves ERT Relays to the Centcomm map
2020-03-24 16:29:54 -04:00
TheFurryFeline a91639880a Soft's Holodeck Move
Does https://github.com/VOREStation/VOREStation/pull/6198 with minor tweaks.

Changelog Notes:

- Moves holodeck from asteroid side to Surface 1.

- Allows access to Garden, Deck Three from Surface Three Hallway.

- - Tweaks of original include as follows.

- - - Entry doors named.

- - - Air Alarm addition inside Holodeck Control.

- - - Switch from shutters to tinted windows.

- - - Disclaimer paper added for holodeck regarding how to fix bruises sustained in the holodeck. Ported from Polaris/Chompers Southern Cross variation.
2020-03-23 16:09:53 -04:00
Aronai Sieyes 0235ea50f1 Increase overmap size, add events
Adjust debrisfield icon
2020-03-19 20:29:43 -04:00
Unknown 7a622adece More Cruiser fixes and prettying up 2020-03-18 21:46:21 -04:00
Aronai Sieyes 4ad035b16d Move most antag things to admin-loadable maps 2020-03-18 01:27:29 -04:00
Unknown b6000e0e49 Fixes Overmap
I did not know that the overmap has to be in 1,1. Rearranges tether_misc to fix that oversight.
2020-03-17 23:35:35 -04:00
Unknown 5c195dac46 Renames stationary translocator 2020-03-15 13:37:32 -04:00