Commit Graph

114 Commits

Author SHA1 Message Date
Will 48aaa61faf Circuitboard Unit Test (#19322)
* fix

* updated test

* types of

* correct boards

* fix those circuits

* clarity

* fix

* try again

* circuit test

* Revert "fix those circuits"

This reverts commit d4468d669a.

* Revert "correct boards"

This reverts commit b49b0d7f2e.

* Reapply "fix those circuits"

This reverts commit 1189ee9524.

* Reapply "correct boards"

This reverts commit af69adbfe8.
2026-03-23 17:51:53 -04:00
Will 0c8488b0ae Move autolathe design datums to techweb datums (#19202)
* testing makes me feel good

* invalid lists

* get rid of those boards

* show expected mats

* oop

* error

* wip techweb porting

* more techweb entries

* ported too

* disable those for now

* okay nevermind i guess

* already exists

* assemblies

* moar

* welding helmet

* many entries

* lol tg

* fix test

* again

* fixagain

* more moved

* update techweb test

* catch that too

* screeee

* more fixes

* missing announcement

* orphaned sleevecard

* some more fixing

* test

* more

* oops

* glasses

* illegal icons

* non starting

* it's starting

* messed up

* cleanup

* more generic stuff

* morrrreee

* the plastic set

* oops

* correct value

* barbed wires

* more cleaning

* many more

* gone

* cleanup

* no longer

* do not allow duped designs

* it's own node

* proper order no dupes

* last of the broken nodes

* fix bad path

* cleanup

* more test more limits

* gone

* almost done

* these are gone

* syringe gun

* bioregenerator design

* all moved

* organized and webbed

* more fixes

* oops

* cleaning up

* organization

* clean up

* organize

* organized

* didn't save

* wrong mat

* adds many missing ammo types

* svd doesn't exist

* 10mm pistol added

* magazines not casings

* these are pistols

* this is used by like, one weapon

* m1 is ancient

* this is hunting

* extremely botched untested lathe

* disk junk

* rough foundations

* slowly converting

* slowly building this

* local materials

* almost

* big reorganization

* more cleanup

* more cleaning

* lathe stuff

* small fixes

* oops

* many fixes

* mat fix

* more fixes

* actually isolate the hacked designs

* protolathe hacking

* imprinter hacking

* missing ammos

* sheet printing for autolathe

* fixs

* again

* fixed test

* test test

* fix

* fix

* WHY

* fix it...

* here we go

* material print

* on turf

* body disk

* consistant name

* Many weapons to hacked lathe

* missing node

* wrong section

* fixes

* this list should be unified

* ammo boxes

* don't do single shells anymore

* wat

* specifics

* snowflake

* not needed

* already available

* pickaxe too

* tweak

* removed unneeded node

* missing surgery items

* Apply suggestion from @Cameron-The-Raven

* Adds RMS

* typo

* illegal needs hacked

* disabled material weapons

* circuit testing

* STRING TEST

* test

* fixing some things

* huh?

* hidden circuits

* some flakey boards

* grammar

* fixes

* more hidden

* wrong board

* security cams

* alert consoles

* spaceheater is simple enough to not have one

* pcus

* cargo vendors

* tcomms stuff

* solar tracker circuit

* artifact stuff

* SM stuff

* illegal machines

* med machines

* no longer needed

* more stuff

* these are not standard

* moreeee

* doppler and more

* organized

* finishing

* oop

* use the define

* inheret

* dopper fixes

* space heater

* doing some organization

* explain the var

* some tweaks

* wrong one

* fixed test

* material test too

* simple roto gens

* use the define

* emergency power node

* tgui fixes for icons

* not needed

* color blended material designs

* icons for large research

* oops

* unshit that

* use stack here

* center math

* .

* .

* .

* .

* .

* unifi

* fix these

* NO COPYPASTA

* ILLEEGGALLL

* mandate descriptions

* agony

* actually lets do this

* use macros

* description

* desc

* desc

* desc

* desc

* desc

* desc

* gps desc

* telecomms component desc

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2026-03-20 19:38:00 -04:00
Kashargul 1fcbb216e7 Convert some more globals (#19231)
* move ref lists from world new to ref list creation

* tg styl

* .

* next globals

* ugh

* some more

* pain

* .

* horror

* .

* .

* .

* shoe me

* ye

* .

* eh

* .

* .

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-03-02 23:57:41 +01: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
Cameron Lennox ca4f172a34 Fix these maps (#18452) 2025-09-11 10:48:37 +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
Selis f4bf017921 Unit Test rework & Master/Ticker update (#17912)
* Unit Test rework & Master/Ticker update

* Fixes and working unit testing

* Fixes

* Test fixes and FA update

* Fixed runtimes

* Radio subsystem

* move that glob wherever later

* ident

* CIBUILDING compile option

* Fixed runtimes

* Some changes to the workflow

* CI Split

* More split

* Pathing

* Linters and Annotators

* ci dir fix

* Missing undef fixed

* Enable grep checks

* More test conversions

* More split

* Correct file

* Removes unneeded inputs

* oop

* More dependency changes

* More conversions

* Conversion fixes

* Fixes

* Some assert fixes

* Corrects start gate

* Converted some README.dms to README.mds

* Removes duplicate proc

* Removes unused defines

* Example configs

* fix dll access viol by double calling

* Post-rebase fixes

* Cleans up names global list

* Undef restart counter

* More code/game/ cleanup

* Statpanel update

* Skybox

* add

* Fix ticker

* Roundend fix

* Persistence dependency update

* Reordering

* Reordering

* Reordering

* Initstage fix

* .

* .

* Reorder

* Reorder

* Circle

* Mobs

* Air

* Test fix

* CI Script Fix

* Configs

* More ticker stuff

* This is now in 'reboot world'

* Restart world announcements

* no glob in PreInit

* to define

* Update

* Removed old include

* Make this file normal again

* moved

* test

* shared unit testing objects

* Updates batched_spritesheets and universal_icon

* .

* job data debug

* rm that

* init order

* show us

* .

* i wonder

* .

* .

* urg

* do we not have a job ID?

* .

* rm sleep for now

* updated rust-g linux binaries

* binaries update 2

* binaries update 3

* testing something

* change that

* test something

* .

* .

* .

* locavar

* test

* move that

* .

* debug

* don't run this test

* strack trace it

* cleaner

* .

* .

* cras again

* also comment this out

* return to official rust g

* Update robot_icons.dm

* monitor the generation

* .

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-08-10 01:37:23 +02:00
Cameron Lennox 19eb84c107 Point Defense Turret Adjustments (#18126)
* Initial

* Rename

* Proper multitool
2025-08-02 19:39:55 -04: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
Cameron Lennox 84dc5535dc var/global/list -> GLOB. conversion (#17928)
* These two are easy

* !!!runlevel_flags

the fact it was global.runlevel_flags.len has me a bit...iffy on this.

* !!!json_cache

Same as above. used global.

* player_list & observer_mob_list

* mechas_list

* this wasn't even used

* surgery_steps

* event_triggers

* landmarks_list

* dead_mob_list

* living_mob_list

* ai_list

* cable_list

* cleanbot_reserved_turfs

* listening_objects

* silicon_mob_list

* human_mob_list

* Update global_lists.dm

* joblist

* mob_list

* Update global_lists.dm

* holomap_markers

* mapping_units

* mapping_beacons

* hair_styles_list

* facial_hair_styles_list

* Update global_lists.dm

* facial_hair_styles_male_list

* facial_hair_styles_female_list

* body_marking_styles_list

* body_marking_nopersist_list

* ear_styles_list

* hair_styles_male_list

* tail_styles_list

* wing_styles_list

* escape_list & rune_list & endgame_exits

these were all really small

* endgame_safespawns

* stool_cache

* emotes_by_key

* random_maps & map_count

* item_tf_spawnpoints

* narsie_list

* active_radio_jammers

* unused

* paikeys

* pai_software_by_key & default_pai_software

* plant_seed_sprites

* magazine_icondata_keys  & magazine_icondata_states

* unused

* ashtray_cache

* light_type_cache

* HOLIDAY!!!

this one was annoying

* faction stuff (red?!)

* Update preferences_factions.dm

* vs edit removal

* backbaglist, pdachoicelist, exclude_jobs

* item_digestion_blacklist, edible_tech, blacklisted_artifact_effect, selectable_footstep, hexNums, syndicate_access

* string_slot_flags and hexdigits->hexNums

* possible_changeling_IDs

* vr_mob_tf_options

* vr_mob_spawner_options

* pipe_colors

* vr_mob_spawner_options

* common_tools

* newscaster_standard_feeds

* Update periodic_news.dm

* changeling_fabricated_clothing

* semirandom_mob_spawner_decisions

* id_card_states

* Update syndicate_ids.dm

* overlay_cache & gear_distributed_to

* more

* radio_channels_by_freq

* Update global_lists.dm

* proper

* default_medbay_channels & default_internal_channels

default_internal_channels is weird as it has a mapbased proc() but that proc is never called...

* valid_ringtones

* move this

* possible_plants

* more

* separate these

moves xeno2chemlist from a hook to a new global list.

* tube_dir_list

* valid_bloodreagents & monitor_states

* Junk

* valid_bloodtypes

* breach_burn_descriptors & burn

* more!!

appliance_available_recipes seems uber cursed, re-look at later

* Appliance code is cursed

* wide_chassis & flying_chassis

* allows_eye_color

* all_tooltip_styles

* direction_table

* gun_choices

* severity_to_string

* old event_viruses

* description_icons

* MOVE_KEY_MAPPINGS

* more more

* pai & robot modules

* Update global_lists.dm

* GEOSAMPLES

Also swaps a .len to LAZYLEN()

* shieldgens

* reagent recipies

* global ammo types

* rad collector

* old file and unused global

* nif_look_messages

* FESH

* nifsoft

* chamelion

* the death of sortAtom

* globulins

* lazylen that

* Update global_lists.dm

* LAZY

* Theese too

* quick fix

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-07-14 20:14:31 +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 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
SatinIsle 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
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
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
Kashargul 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 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
Killian 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
ShadowLarkens 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
Selis 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
Heroman3003 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
Novacat 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