Commit Graph

299 Commits

Author SHA1 Message Date
Guti 9a37ecee96 Anomaly Harvesting Tweaks (#19278)
* Tweaks

* Up the cost + Map changes

* Makes unsimulated turfs non-transformable

* Almost :)
2026-03-12 21:55:26 +01:00
Guti 7018074d55 Anomaly Harvesting (#19068)
* Automatic changelog compile [ci skip]

* Anomalisci

* TGUI stuffs

* Fimx

* Colours

* Little polish

* Remove mult

* .

* Anomaly harvester

* Particle gun

* Dangerous anomalies

* Emitter update

* Suspension generator

* Flux & Weather update

* Techweb + Mapping

* Fixup maps in TGM format

5cff3b2d1d: maps/tether/tether-01-surface1.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* fimx

* Oops that wasn't updated

* I swear I got it this time

* Adjustments

* Dust anomaly

* Couple of fixes

* Borg stuff

* Scanner module

* Fix attempt

* Boxless

* Fix (Hopefully)

* Changes

* .

* fix ranges

* fix the harvester UI

* wrong typing

* dm icon handles icon sizes internally

* stack gap handles that

* .

* .

* .

* fixes

* refs are unique keys

* release all

* .

* .

* Change

* Grip those samples!

---------

Co-authored-by: vorestation-ci[bot] <199609141+vorestation-ci[bot]@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2026-03-11 21:17:52 +01:00
Killian dcb7b80cd2 Resleeving sickness pill map removal (#18798)
* resleeving cure pill removal

* Update _reagents.dm
2025-11-19 20:38:24 -05:00
Killian 51e591a527 fusion coils (#18716)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-11-08 03:48:04 +01:00
Ryumi d395f4ab65 Adds a new redgate map: The Casino Canal (#18587)
* starts da map

* starting to shape up I think?

* moar edits

* we got lots more stuff now

* we got dorms now :)

* moar doarm and PRIVATE GAME ROOMS WOAG

* adds chip machine

* tidy dis up

* oops

* pretties up private game rooms a bit

* ok now the chip dispenser works

* Adds resleeving stuff

* Adds pixel-displaced children of punlic paintings

* mmmmmm maint stuff

* adds VIP rooms and more maint stuff

* that's a lotta shit made woooo

* its almost... done... (the main building is anyway)

* Let's get this bih to actually load

* And let's get some proper areas separating indoor and outdoor

* Makes casino hall turfs actually render as intended

* WE HAVE AREAS NOW

* don't need this big ol file any more

* MOSTLY finishes the mai nbuilding

* finally finishes the main building (for now)

* does some exterior stuff but now it's crashing WHY

* oops

* adds subvariant of floodlight that starts turned on

* adds areas for well, secret areas

* TOO MUCH new shit

* Does a silly thing to make properly underwater cave turfs

* adds "open" underwater turfs that are functionally transparent divable turfs

* more funny secrets

* Makes open water turfs show a darker view underneath for visual clarity

* okay I think it might be done now

* makes indoor water effect look a bit nicer

* I ALMOST FORGOT

* engoodens code surrounding multiple auto-resleevers existing

* FUCK

* DOUBLE FUCK

* Lets things with GLASSPASS move through TGMC widnows

* actually it makes more sense for the TF gun to be here

* Makes 🏴‍☠️ secret a bit nicer

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-10-25 00:30:41 +02:00
Killian 190119a88d Unified Ghost Hole (#18608)
* unified hole

* unified hole grammar pass, event replacement, and redgate variant

* unified hole grammar pass, event replacement, and redgate variant

* unified ghost hole

* unified ghost hole

* unified ghost holes

* Update vorestation.dme

* Update unified_ghost_hole.dm

corrected logging

* Update unified_ghost_hole.dm

aaaaa typo. also some general message phrasing tweaks.

* Update unified_ghost_hole.dm

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-10-16 23:21:07 -04:00
Kashargul 2625ecf2af smes linting (#18588)
* smes linting

* Linting map work for smes (#17)

* wip

* stellar delight

* tether

* missing coils

* remaining coils

* More smes linting (#18)

* fixed the hybrids too

* snowflakes

---------

Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
2025-10-16 13:31:10 -07:00
Will b594262fec Tethered Item Component (#18499)
* tethered component

* can't do that

* visible_message should always show

* forbid storing

* catching some small issues

* visible message is fighting a bit too much

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-09-22 04:40:53 -04:00
SatinIsle 5411fd352d Power Outage Buffs (#18457)
* Power Outage Buffs

Added emergency door releases to autoresleever rooms.
Changed autoresleevers to still work without power.
Added short range radios (off by default) to emergency supply boxes.
Changed APCs to allow the cover to be opened by anyone beneath 15% charge.

* Update stellar_delight3.dmm

Gives APCs on the SD comms rooms more charge. Seems tether already has these.

* Update stellar_delight3.dmm
2025-09-11 20:22:46 -04:00
Cameron Lennox ca4f172a34 Fix these maps (#18452) 2025-09-11 10:48:37 +02:00
Kashargul e956d13a6b jobs, access and radio to defines (#18297)
* jobs, access and radio to defines

* .

* .

* urg

* .

* .

* finish the radio freqs

* why

* .

* .

* ticker initial

* eh

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-08-31 01:32:36 +02:00
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
SatinIsle 14c2035416 Gold Star Printer (#18129)
* Gold Star Printer

Added a new Gold Star Printer to HoP offices. This printer prints gold stars with a short title of "Gold Star for X" and a custom description for more info. These gold stars can be used as accessories on underclothing. They can also be stuck to ANY object that doesn't have a custom attack interaction (so, it won't stick to tables, or most machines that you can put things in), and when stuck to an object it simply adds a little suffix to it's description stating it has a gold star attached. Yes, you can attach it to absurd objects but that's funny.

Any printed stickers are admin logged so we can track abusive stickers.

* Removes sanitize
2025-08-07 02:52:13 -07:00
Cameron Lennox 19eb84c107 Point Defense Turret Adjustments (#18126)
* Initial

* Rename

* Proper multitool
2025-08-02 19:39:55 -04:00
Will f67d095338 Reagent Refinery (#17955)
* starting port

* missed one

* fixes and wip

* more cleanup

* reagent data setup

* distillation testing

* tanker dmi again

* supply pack fix

* Tiny fix

* better formatting

* metallic paints and outpost reagents

* working on refinery tutorial, reactor construction icons

* reactor activation dot

* updated for new reagent hoses

* This as well

* pump relay object

* climbing support

* less ugly trolly tanker handling

* more cleanup

* reagent pumping updated

* climbable tanker

* fixed test

* test fails

* smart centrifuge board

* pump relay art updated

* hose doesn't show message when stacking

* gas cracks and fracking

* randomly spawned gas gracks

* indentation

* fixed

* runtime fix, lore fix

* turf change respecting atmos

* args

* nevermind

* gas cracks to poi fodder

* less gamer

* compile fix

* oops

* Old ores enabled

* paint distillations

* unittest

* many more distillation reactions

* nullcheck

* guide book

* tweaks to globs

* moved designs

* techweb

* reagent tanker sale element

* proper tag

* sellable

* typo, reduced hose connectors

* show reagent

* synthfab fix

* Revert "synthfab fix"

This reverts commit b7764cfb33.

* post sale tank handling

* tweak

* oops

* another oops

* smasher recipe now valid

* condensing gas recipies

* those too

* condensing tweaks

* matching mols better

* fluid pump missing

* code review

* no rain code here

* smart centrifuge update

* small grinder patch

* grinding fix

* fix
2025-08-02 07:07:17 +02:00
ShadowLarkens b60cd47309 Techwebs & Experi-Sci (#17987)
* Techwebs

* Add basic stock parts

* Techweb production machines

* Circuit Imprinter

* More work

* More designs

* More designs, nodes'

* More more

* Better sorting for designs

* Add the exosuit fab'

* More conversions

* More and more and more

* mechfab parts

* Modsuit Designs

* Pinnace baron

* Equipment

* more mechfab

* vehicles

* more mecha

* Micro mechs

* Update mechfab_designs.dm

* no time

* zero

* Update mechfab_designs.dm

* Prosthetics Fabricator and fixes

* Update maps to use new parts

* Whoops, fix a few maps

* Fix lint error

* Port scene tools

* Fireworks~~

* Don't label the sex toys as sex toys

* Fixup maps in TGM format

26517b7122: maps/virgo_minitest/virgo_minitest-1.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* Significant portion of designs converted

* Fix paths

* Fix tgui lints

* Just a whole bunch of designs

* Almost doneeee

* ALL DESIGNS CONVERTED

* Merk all of the old stuff

* Fix a few errors

* Fix more errors

* MORE FIX

* Make server control work

* Undo changes to archive

* Fix a TODO

* Make disks work

* Start the long process of finishing the node tree

* One more oops

* All mechfab designs

* Add departmental protolathes

* Down to 200 designs unsorted

* FINISH TECHWEBS

* Fuck whoops

* Remove the debug verbs

* Little map tweaks

* Fix mousedrop

* More map fixes

* Upstream bug lmao

* guess CI hates this

* Fixup maps in TGM format

fe062e7bc4: maps/tether/tether-03-surface3.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* I gotta stop committing this

* Change scree requested

* Make science able to print implants too

* Fix ghost spawns

* Move NSFW gun

* Merk partbundles, make janus module work

* Pretty animation when you complete the tree :)

* Don't display designs you can't print

* Move security protolathes to warden's office

* Make servers recover from power failure gracefully

* Make fabricators drop their mats on the ground when destroyed

* Ore Silo

* Make CI happy

* Fixup maps in TGM format

fe062e7bc4: maps/tether/tether-05-station1.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* Fix MC crash

* Make experiscanner work for borgs

* I REALLY gotta stop committing this

* Make scientists and the RD spawn with an experiscanner

* Lock NIFs behind scanning mice

* Make Biome happy

* Allow scanning Cocoa and Kendrick in case they can't find mice

* Change from Kendrick to Ratthew, ;help maint, or Brick

* Change the name of the /rat/pet class so the experiscanner is more helpful

* Add departmental_flags to a bunch of things

* Remove a few things from security's techfab

* Add a second engineering lathe to atmos

* Fix runtime recycling rig modules, add name to cost sequence

* Add a discount experiment for scanning slime cores

* Change some fluff and shuffle chameleon clothes to bluespace yadayada

* Make closets alt click immune

* Do a bunch of sorting

* Silly

* Hopefully fix all infinite material bugs in techwebs

* bad merge

* quick ai fix

* fix some robot stuff

* axe downlaod fully

* list

* no ref

* easier readable

---------

Co-authored-by: C.L. <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-07-26 06:30:08 +02:00
Kashargul a2a4ad5210 frequencies must be odd (#18009)
* frequencies must be odd

* Update banned_frequencies.yml

* Update banned_frequencies.yml

* Update banned_frequencies.yml

* Update banned_frequencies.yml

* Update banned_frequencies.yml

* Update banned_frequencies.yml

* Update banned_frequencies.yml

* Update banned_frequencies.yml

* Update banned_frequencies.yml

* as drathek suggested

* mass radio fix

* .

* revert this for now

* umm

* to defines
2025-07-16 18:31:28 -04:00
Kashargul 784d4b49f4 fix floors on turf change (#17975)
* fix floors on turf change

* right icon

* .

* .
2025-07-08 19:11:53 -07:00
SatinIsle 94d9de3513 Janicart spawns (#17808)
Added janicart and keys for it to each station map. This is just in the existing room on SD and RP. On the tether, there is a small garage on the side of the janitors office now, because I thought that would be cute!
2025-06-06 04:06:36 -07:00
ShadowLarkens 6b72c09810 Convert all of the lobby gifs to either png or webp (#17623) 2025-04-28 22:29:03 +02:00
ShadowLarkens 8f2f1f80df Overhaul title screens to be more compatible with TGUI (#17617) 2025-04-27 21:19:49 +02:00
Guti 640cab345e Virology Update #3 (#17227)
* Base stuff

* Thresholds

* Cockroaches, adjustments

* Extrapolator + TGUI Update

* Adjustments

* Updoot

* Revert "Updoot"

This reverts commit 8c27a2525e.

* Gwuh

* test

* heals

* Genetic

* Holder and vomit

* Indents

* Compilable :)

* Various fixes

* Updates Symptoms

* Genevirus

* Neutered Symptoms

* Adjustments

* rads

* Extra symptoms

* Extra extra symptoms

* Adjustments, fixes, more symptoms

* Powder that makes the linter green

* Finishing touches?

* Fixup maps in TGM format

5041170ae1: maps/expedition_vr/beach/submaps/quarantineshuttle.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* Last bits

* Defines

* Oxy heal

* I crave the green check

* fix

* Maps

* Macrophages to turf

* Fimxes

* Fixes :)

* Vomit

* Preset

* Fire desc

* SPELLING MISTAKE

* Extra stuffs

* types

Allows infecting children of a type

* feet

paws?

* fix

* Fixes

* Update

* Flags

* Update _disease.dm

* Infinite blood glitch (100% real)

* virus data properly carries over

* GODSPEED, KELENIUS

YOUR 10 YEAR TODO IS FINALLY DONE

* define

* U2

* Implicit

* Damn it Fleming

* oops

linter is kill

* Update _reagents.dm

* Extra check

* .

* ough

* fixes

* Small changes

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-04-21 06:12:15 -04:00
Kashargul cdfa1c853f New to init final (#17512)
* Initial

* some more

* next few

* only light left

* fix things up

* some rmore fixes

* guh

* Update ai_vr.dm

* comment

* lets try something

* .

* hmm

* .

* .

* hmm

* push that here

* fix layout

* grrr
2025-04-14 00:07:35 +02:00
SatinIsle a1a4acc464 Bingle computers (#17438)
* Bingle computers

Added a bingle computer to each library and command briefing room. May add more to other places in future, depending on what people want.

* Fixup maps in TGM format

29d373d2b8: maps/groundbase/gb-z2.dmm
29d373d2b8: maps/stellar_delight/stellar_delight1.dmm
29d373d2b8: maps/tether/tether-03-surface3.dmm

Automatically commited by: tools\mapmerge2\fixup.py

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-03-28 23:03:21 +01:00
Kashargul 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
Kashargul 2556102719 only tab indentation (#17408)
* only tab indentation

* .
2025-03-23 15:28:15 +01:00
Kashargul f881d54dbf Panel port test [IDB IGNORE] (#17350)
* no more self callbacks on update fullness

* fix missing code

* Belly test

* import type

* full partiy

* .

* fix preview

* in belly to late join

* robot nutri

* .

* .

* update export

* finish open todos

* code cleanup

* fix some old slacking

* move this to a define

* fixing

* ,

* .

* Creates a Consume Belly Reagents pref (#10)

* Creates a Consume Belly Reagents pref

Added a Consume Belly Reagents pref that blocks the consumption of all reagents produced by a belly via reagent containers such as food, drink, beakers, pills, syringes and hyposprays. Seems to work well as intended.

* These changes at least do not cause any problems

* Missed this one

* Reverts reagent_names

* _BELLY versions

* Fixed typo

* .

* fix admin spawn mobs bellies

* also fix that bug

* hints

* fix that

* .

* initial

* should be all

* that is no longer needed

* fluids into hand items

I was convinced this was broken until it was pointed out that the item has to be ON THE GROUND to fill it...Instead of in your hand. That seems so convoluted.

ARC = active-hand reagent container. IRC = inactive-hand reagent container.

* some stuff

---------

Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-03-16 17:08:47 -04:00
Kashargul 47b71270a9 fix some issues (#17362)
* fix some issues

* .
2025-03-16 16:01:30 +01:00
Kashargul 4d36cfdaeb Finish Machinery new to init (#17334)
* Finish Machinery new to init

* fix that

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2025-03-16 03:57:48 -04: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
Guti df68507385 Adds a couple of mail scanners and mail bags to all the maps (#17324)
* MAIL

* Hatfix
2025-03-13 01:18:10 +01:00
Kashargul 6a102da67a finish that up (#17285)
* finish that up

* .

* type import

* .

* .

* .

* .

* .

* .

* .

* .
2025-03-09 14:08:51 -04:00
Drathek 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 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
Drathek 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
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
Drulikar 4d0c9f9a98 Merge remote-tracking branch 'upstream/master' into fix_minimap_renderer 2025-01-11 23:45:05 -06:00
Kashargul fdcbdf15d6 Events (#16876)
* cleans up event defines

* also here
2025-01-09 20:51:08 +01:00
Drulikar ac8f3d5dd0 Fixes 2025-01-07 06:52:06 -06:00
Killian 444bd79910 mirror mirror on the wall... (#16840) 2025-01-06 06:45:34 +10:00
Kashargul 819ff4301f wipes out all cell map edits (#16727) 2024-12-18 20:26:44 +10:00
Kashargul 939fcbb488 Merge branch 'master' into reagentToDefines 2024-12-06 21:57:14 +01:00
Heroman3003 9941ffa8dc Merge branch 'master' into areaStuff 2024-12-07 05:14:52 +10:00
Heroman3003 fd4f187ea1 Merge pull request #16669 from SatinIsle/coffeeeeeee
Barista love
2024-12-07 05:08:01 +10: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 01813cd4d0 maint lurker setup 2024-12-04 12:22:40 +00:00
SatinIsle 4cf5beeabe Added more cup sizes
Added tall, grande and venti cups that get named similarly to the normal cups.

Added ginger and gingerbread syrups, on request of my wife, lol.
2024-12-03 20:06:57 +00:00
SatinIsle 35503f3113 Barista love
Added a new dispenser to cafes on each station, the syrup dispenser. These just add flavoured syrups to your drinks, but don't do much unique by themselves. This allows people to customise their coffee more.

Added a whole bunch of flavoured syrups, such as pumpkin spice, chocolate, irish cream and more.

Added new coffee recipes, including things like americano, macchiato, breve, cappuccino and mocha. Unfortunately flat white and latte would cannibalise other recipes if they just used milk and coffee, so they use drip coffee instead.

Added a few new coffee reagents, drip brewed coffee and milk foam.

Changed coffee cups to now include the name or description (in the var cup_prefix) of certain additional reagents. For example, if you have a cup with 25u of mocha and 5u of pumpkin spice, it will take the name "cup of pumpkin spice mocha". A lot of existing reagents have had these added too.

Added a wall locker with additional cups to every station cafe.

Added pineapple juice as an option to the soda vendor.
2024-12-03 14:35:45 +00:00