Commit Graph

24 Commits

Author SHA1 Message Date
Gandalf
31c8d7ca34 Massive shuttle refactor and arrivals system change (#4572)
* FIRST!!

* aaaa

* Update floor.dm

* aaaaaaaa

* aaaaaaaaaaaaaaaaaaaaaa

* aaaaaaaaaaa

* Update CentCom_skyrat_z2.dmm

* Update MetaStation_skyrat.dmm

* aaaaaaaaaaaaaaaaaaaaa

* crashing this shuttle with no survivors

* aaaaaaaaaaaaaaaaaaaaaa

* aaaaaaaa

* aaaaaaaa

* Update emergency.dm

* aaaaa

* Update emergency_skyrat.dmm

* Update emergency_skyrat.dmm

* aaaaa

* a
2021-04-05 14:49:02 +01:00
SkyratBot
bdc9b9aaaa [MIRROR] Fix typo on map_config JSON parsing (#1482)
* Fix typo on map_config JSON parsing (#54603)

* Fix typo on map_config JSON parsing

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-10-27 09:40:57 +01:00
SkyratBot
dc7d9a81a1 [MIRROR] Fix Map JSON loading errors (#1460)
* Fix Map JSON loading errors (#54563)

Also fixes that one runtime everyone runs into when they first load in

* Fix Map JSON loading errors

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-10-25 11:11:00 +01:00
SkyratBot
ed99a59ae9 [MIRROR] Out of repo maps part 1: JSON Improvements (#1432)
* Out of repo maps part 1: JSON Improvements (#53663)

Replaces the map job changes code system with a JSON based one.
Added map versioning to the config JSON.
Formats map config JSONs.

* Out of repo maps part 1: JSON Improvements

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2020-10-23 05:08:50 +01:00
jdawg1290
62676e72a8 Force LF line endings with gitattributes and convert repo (#52266)
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-07-16 03:02:40 +03:00
skoglol
eca1ebad92 Removes BoxStation in favor of IceBox 2020-07-06 15:03:07 +02:00
TheChosenEvilOne
a66126d7e3 Add map voting (#44244)
- Add map voting
- Rename config option for preferred map weighted map selection
2019-06-04 23:55:14 +02:00
Tad Hardesty
018a74e558 Allow configuring ruin/empty space level count - #36191
Allows map configs to set how many ruin levels (def. 7) and how many empty levels (def. 1) that will be created. Most useful for landlocked stations, event/one-off stations with unusual composition, or testing situations such as RuntimeStation.
2018-03-07 02:48:22 -05:00
Tad Hardesty
bbe4d12d13 Support stations with multiple z-levels (#35339)
* Remove ZLEVEL_STATION_PRIMARY

* Add Up and Down traits for use by ladders and chasms

* Give map_config creation its own proc

* Combine LoadConfig and ValidateJSON and remove transition_config

* Make space linkage a z-level trait

* Remove ZLEVEL_EMPTY_SPACE

* Update uses of GetFullMapPath

* Handle multi-Z stations and load Lavaland and Reebe at runtime

* Remove unused space maps

* Fix inappropriate z-expansion in map reader, improve logging

* Update comments relating to z-level configuration

* Add Lavaland and Reebe to ALL_MAPS
2018-02-15 10:21:25 +01:00
coiax
8e20aa3f7b Refactors shuttles to be loaded in, rather than be on the station maps (#33766)
* Refactors shuttles to be loaded in, rather than be on the station maps

- Shuttles are now loaded in by the shuttle subsystem.

You configure what shuttles are loaded in via
`/obj/configuration/shuttle_load` objects.

* Box arrivals shuttle is now imported from template

* Moves things out of the #ifdef

* Box emergency shuttle is now imported

* Box emergency shuttle is now templated

* Box ferry and whiteship now load from template

* More shuttles on Box done

* Apart from the pods, Box is now completely templated

* Delta now has all non-awkward shuttles loaded in

And Centcom..

* Removes no ops turfs, more error messages

* Fixes slightly chopped off external wall

* Massaging more shuttles into working correctly

* Debug messages are king

* Delta cargo shuttle now docks again

* First pass of Metastation shuttles

* Omegastation first pass

* Metastation now has its own shuttle

* Did most shuttles on Pubby

* Turns out Pubby arrival shuttle is slightly smaller than Box arrival

* Whoops, missed a stationary port

* TGMified the pubby arrival shuttle

* First pass, box is working

* All stations now have roundstart_template and no configuration objects

* Removes roundstart_move

* Why do we even have these unused keys

* Remove unused coded vars

* removes some excessive safety checks

* Missed some Centcom cargo dock stuff

* Got it working again

* That thing that Cyberboss wanted

* Noop turfs the shuttle templates

* And template noop for the area

* Attempts to assuage travis

* Warning!

* Please love me, Travis

* RIP Remie
2018-01-25 15:18:15 -05:00
Jordan Brown
db1e201e27 Fixes error if next_map.json is missing (#34222) 2018-01-11 04:53:42 -05:00
Jordan Brown
379869ef6b Fixes allow_custom_shuttles default (#32221)
* Fixes allow_custom_shuttles default

* Fix the check
2017-10-31 09:20:34 +13:00
Jordan Brown
9375965fd7 Fixes map_config validation (#32206) 2017-10-29 16:25:50 +01:00
Jordan Brown
fba7e224b9 Map config cleanup (#32132)
* Map config cleanup

* Fix
2017-10-28 11:34:39 +13:00
AnturK
1a210f626c Fixes transitions (#31084)
* Fixes transitions

* Cautionary comment.
2017-09-28 10:17:11 -05:00
Ashe Higgs
b7e7779c19 (Ready) Clockwork Cult Rework: Proof-of-concept (#29741)
* Starting on the rework

* Reworks the Ark

* Work on Reebe

* More Ark stuff

* this too

* Removes ark silliness, remaps Reebe a tad

* Spawning mechanics

* Work on gamemode code

* Finishes up ark stuff

* Removes Judgement, and lots of other changes

* New Ark activation sounds, Ratvar text

* Spawn protection!

* Adds the abscondence bijou

* Bijou stuff

* well, this is it

* somewhat absentminded coder

* Remaps the Reebe z

* replica fabricators now work!

* Guide paper!

* Now they're clockwork floors

* Infirmary, tweaks, numbers

* A new thing!

* this is ok for now

* I was gonna whine but it's actually necessary

* Adds damage scaling to ocular wardens

* I missed a thing

* you can go back too

* New clockwork armor sprites

* Weapons, scripture, oh my!

* no! shoo!

* hey, I forgot about you!

* this looks much better, I'll give you that

* no teleporting into the void!

* we have no need of you anymore

* Conflicteroos

* AUTOMATIC SPINNING CHAIRS

* how many times do we have to teach you this LESSON OLD MAN

* flagged!

* last time, meesa promise

* Conflicts 1

* wood filling

* Kindle is a projectile, and other stuff

* Chameleon jumpsuit, some small changes

* 150 hours of testing

* Curious is the trapmaker's art

* Conflicts 1

* naaah

* Fixes an ark sound

* Removes the prolonging prism

* Adds a delay to warping in

* First steps towards changing the power system

* Removes power from sigils, moves to global

* Conflicts 1

* zoom zoom

* Adds the stargazer, re-adds conversion

* conflicts? more like CLOCK-flicts

* get it? clockflicts?

* Daemon tuning

* Scraps components, 1/?

* A grace period, among other things

* You can't get to reebe from space no stop bad

* Adds some cogscarab shells to Reebe - yes, I get the sounds

* FUCK

* Chairs are very important.

* Clock golems, sound improvement, intercoms

* Sounds, floor fixes, conflicts

* Fixes the conflicts

* Prevents intercom use during non-clock rounds

* Wiki, HUD timer, tweaks, golems

* Components, removes unused structures, rep. fab power

* go-time

* Ending the round is not a good idea

* whoops, forgot about you

* ssh is ok

* this works too
2017-09-27 09:21:26 +13:00
Jordan Brown
4ee90a73a2 Converts map_config.dm to tabs 2017-09-05 10:19:36 -04:00
Iamgoofball
0ce1627d71 Allows disabling shuttle purchases per map. (#30169) 2017-08-25 22:51:04 -05:00
shizcalev
22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
Jordan Brown
94effbd25f Replaces all instances of the tgstation2 map with Box Station (#28463)
* Replaces all instances of the tgstation2 map with BoxStation

* Fix basemap
2017-06-25 18:15:56 +02:00
Jordan Brown
2dc58b605e Fixes Centcom not being selflooping 2017-05-28 15:42:39 -04:00
Cyberboss
575440c12f Fix map_config validation (#25542) 2017-03-28 20:17:25 -03:00
Cyberboss
7ad4aa7a19 Improve SStitle. No delay icon loading (#25541) 2017-03-28 15:40:37 -03:00
Cyberboss
1bbc640afe Runtime Dynamic Station Loading (#24171)
* Dynamic map loading prototype

* Get the title screen working

* Fixes the random pod bugs

* map configs

* Add back the asteroid

* Ignore the rotate file

* Fix some shit

* More shit fixes

* Babby's first json

* Cyberboss confirmed shitcoder

* Makes map rotation great again

* Moves the map defines

* Delete tgstation2.dm

* Convert runtimestation

* Convert PubbyStation

* Convert OmegaStation

* Convert Metastation

* Convert Delta Station

* Lol file extensions

* Reee line endings

* Take out the trash

* Fix loadallmaps.dm

* Deltaassssssstation?

* Fix travis

* Did I ASK you to change the line endings?

* Remove votable maps

* Cleanup

* Previous config. Load configs in New. Fix splash

* Fix this

* More generic minetype

* STOP TOUCHING THE LINE ENDINGS!!!

* Add some flexibility to /obj/screen/splash

* Fix the shit

* Update gitignore

* Smooth transition from last map

* Better check

* Missed this map rotate check

* Remove these checks too

* Prep for a future request by @kevinz000

* Fix z2 line endings

* Solution for custom .dms

* Rename some things, trim some fat

* Fixes default map_config

* Remove stale comment

* Delete the previous config after loading

* Don't try to open a non-existent file

* Delete the old rotator script

* And references to it

* Line endings

* More line endings

* Del checks from when m-config may have not existed

* LINE ENDINGS

* Update the default map config

* Map load error checking for what it's worth

* Small cleanup

* For case sensitive

* File systems

* Strip maprotate stuff from build script

* Spruce up the _maps tree. Compile some empty space

* Make travis simpler

* LINEARU ENDARU!!!

* tgstation TWO!!!

* Lowercase mine type

* Dummy dm's for testmerging

* Fixes job ordering

* If ghosts wanna watch the map load so be it

* Let them know what's going on

* Fixes z-transitions

* Optimize z expansion further

* Remove this old var

* Fix wiznerd teleportation

* Rmove butt

* Does the thing

* Moved temp configs to the data dir

* Un-touch gitignore

* Forgot templates.dm

* Forgot to include the includer

* Fair enough

* SILENCE IMBECILE!

* @Cyberboss still a fuckboi

* Speed things up a bit

* Fix a potential bug with the error message

* Whatever
2017-03-07 10:45:31 +13:00