712 Commits
Author SHA1 Message Date
KashargulandGitHub 56f7b79154 comment out dupe include (#17752) 2025-05-27 11:09:07 -07: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
SatinIsleandGitHub 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
KashargulandGitHub 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
DrathekandGitHub 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
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 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
KashargulandGitHub 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
KashargulandGitHub 987be6070d bunch of inits without return and a few easy new to init (#16815)
* bunch of inits withou return

* Update cans.dm

* bunch of New to Init

* fix that

* .

* .

* move black hole to init and callbacks

* .

* oups, should not do that late at night

* some more without returns
2025-01-02 18:31:38 +01:00
KashargulandGitHub 819ff4301f wipes out all cell map edits (#16727) 2024-12-18 20:26:44 +10: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
Guti f4f5476121 Merge branch 'master' into weapon-removal 2024-09-18 18:07:43 +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
KillianandGitHub 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
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
VerySoft e24e5e84f9 Also adjust the other maps 2023-07-03 02:29:15 -04:00
VerySoft 4628e467c2 Tweaks and tidying
Adjusts some types to tidy up the mob list. Put some of the mobs that can vore under the vore tab, removed the clown mobs from /mobs_monsters because they were the only thing in there, so there wasn't really any point in hiding them a level deeper, and generally looked for subtypes that didn't have anything in them, and commented those out. Did you know that telesci is supposed to have a chance to spawn hostile mobs if you mess up? It's true! I may or may not have fixed it, I don't play telesci, but it uses a path that actually has mobs in it now.
2023-07-03 02:09:51 -04:00
Runa Dacino 61ef3c1f35 fix(repath): Fixes ore satchels from picking up BS crystals
* Repaths Bluespace crystals from obj/item/weapon/ore subtype to obj/item/weapon subtype.
* Adjusts all code references appropriately

I've looked as far as VScode can let me, and I could not find any actual implementation, reference of mechanic that looked like it was using the /ore/ subtype's special mechanics.

Furthermore, I looked in mine_turfs and mineral outcrops codes to see if bluespace crystals were ever treated as an ore/mineral. Once more, I found nothing there either.

Beyond this, I asked cody if they'd ever encountered BS crystals as part of the xenoarch procedure and they reported no

Therefore, I've come to the conclusion that there is absolutely no reason for bluespace crystals to be an ore subtype. Doing this does lose their ability to be sampled by a core sampler but... There was no turf that'd spawn BS crystals (and ore sampler requires it to have been made by a mineral turf).

As such! I repathed it and all references to it and its artificial subtype.

Testing shows that all techs involving BScrystals function as expected (telepad, telesci computer, quantum pad), with deconstruction and construction alike and their expected functionalities.
2023-06-20 17:04:01 +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 94b0cbb16b light light pass 2023-05-25 20:12:29 +01:00
Killian 5f3f0e1024 item banks for all!
you get an item bank, you get an item bank! and you get an item bank! everyone gets an item bank!
2023-05-22 04:25:33 +01:00
VerySoft 51c68250a7 Speed and stuff
This may break REGs since they weren't designed for mobs with negative movement cooldown values but we can address that later if it becomes a problem

Also fixes a couple emotes for pAIs
2023-03-21 15:28:20 -04:00
Heroman da1b892dae Hopefully fixes longstanding tether active edge 2023-02-19 05:06:36 +10:00
Heroman 0aa925be1f Fixes boxing ropes (bottom) and boxing turnbuckle not blocking properly 2023-01-22 13:48:03 +10: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
VerySoft a7cc2ce61a getting close 2022-12-22 12:33:25 -05:00
VerySoft d1fc579cf1 Add library computer to CC 2022-11-26 17:20:45 -05:00
Heroman fb97518066 Increases underground yields in underdark 2022-08-13 15:19:36 +10:00
Heroman eae0017d77 Maybe-hopefully fixes active edges on Tether Centcom 2022-08-11 16:19:04 +10:00
Heroman 3759b8d5f5 Moves Tether Underdark to southeast corner 2022-08-01 14:39:20 +10:00
Heroman a08a3520d2 Fixes practice shells not loading on poi 2022-07-26 05:36:50 +10:00
Aroliacue da57263b0f Adds meds to Tram + firefighter gear to Midpoint 2022-07-07 10:20:41 +10:00
Heroman e70731d417 ALL runtimes
ALL runtimes
2022-06-23 18:48:28 +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 40379d01d8 I did it 2022-04-04 03:36:08 -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
VerySoft 5930e5f896 Forgot this part 2022-02-26 05:56:55 -05:00
Heroman bcaaf1f60a Removes two overly dangerous Wilderness PoIs 2022-02-09 06:36:58 +10:00
Unknown 63d18c53f7 Part two of standardization 2021-12-06 23:59:06 -05:00
VerySoft 2516a17bd4 SD QOL update
Fixes a few map issues.
2021-11-16 01:40:24 -05:00
VerySoft 6503008011 >:C
I bet this will help with those active edges.
2021-11-01 05:03:41 -04:00
VerySoft e40c4e6102 Further map tweaks
adds a door to CC and adds a box of lights to the janitor's office.
2021-10-30 21:49: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
CaseyandGitHub efffd2d5c1 Merge pull request #11606 from KillianKirilenko/kk-pois2
Plains POI Audit
2021-09-24 00:32:57 -04:00
Killian 6400fab70e fix file load order 2021-09-18 04:04:17 +01:00
VerySoft 4c6885a50f Update mob spawners/spawns
Teppi can rarely spawn on Virgo 3b now after an incident where they were released and able to survive. 

This also makes it so that gaslamps, geese, and teppi are all in the same spawn pools and such, with gaslamps being 3 times as likely as geese, and teppi being very rare, this will result in the odd goose outside of the wilderness, but, geese are easy to beat up and slow, so, that's probably fine, especially considering how few spawns there are outside of the wilderness.
2021-08-29 07:14:00 -04:00