Commit Graph

32 Commits

Author SHA1 Message Date
Ling
09549221c4 Merge pull request #1766 from yogstation13/upstream-merge-39160
[MIRROR] Fixes loading maps in standard dmm format.
2018-07-17 11:28:16 +02:00
vuonojenmustaturska
d86a066d30 Fixes Reebe not initializing for clockcult mode, leaving the area airless and nonfunctional (#39163) 2018-07-17 07:33:15 +01:00
AnturK
716df0b5d5 Fixes loading maps in standard dmm format. (#39160)
As opposed to tgm. Also minor performance tweak for these since we don't
support jagged maps.
2018-07-17 01:02:11 +01:00
Jordan Brown
57069199b5 Seperates map reader parsing from loading (#38764)
* Seperates map reader parsing from loading

* Compile fixes

* Uhhh, ok dm

* Ugh

* Fix one error...

* FIxes model caching
2018-07-13 17:07:45 +01:00
Nich
6c879778b6 spellchecks tg whatever 2018-06-28 21:26:38 +02:00
Jordan Brown
7abe962db0 Merge pull request #37549 from ShizCalev/bounce_away-fixes
Resolved var name conflict for bounce_away()
2018-04-30 18:54:04 +01: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
vuonojenmustaturska
355c21acb1 Remove mobs/idlenpcpool Initializers, make mob/client expansion happen when maxz is incremented (#34987)
* work

* Seems to worky

* one more place where maxz is touched
2018-01-27 23:16:20 +01:00
ninjanomnom
3e8271c77b removes ruin baseturf helpers for lavaland surface
and fixes related issues
2018-01-23 10:00:02 -05:00
ninjanomnom
dcacb06269 makes templates use PlaceOnTop 2018-01-23 01:01:18 -05:00
AnturK
8c514c1e82 Fixes ChangeTurf runtimes in late loaded templates. 2018-01-15 10:16:47 +01:00
Emmett Gaines
4595c46dca turns the baseturf var into a part time list (#33705) 2017-12-25 20:10:08 -05:00
Emmett Gaines
25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
Emmett Gaines
7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ninjanomnom
2817a1737b defines math 2017-11-22 17:36:58 -05:00
ShizCalev
179844d5f2 Makes the noop turf less eyerapey 2017-10-08 13:48:38 -05:00
kevinz000
d951b65eba Admin "Reload Station" Map Generator - Reloads specified block to roundstart. (#28986)
Badmins: Buildmode map generators have names in the list to select them, instead of paths.

Also, a new map generator has been added, repair/reload station. Use it VERY sparingly, it deletes the block of the map and reloads it to roundstart. THIS CAN CAUSE ISSUES WITH MACHINES AND ATMOSPHERICS, SO DO NOT USE IT UNLESS YOU ABSOLUTELY HAVE TO!

The reload station one tagged DO NOT USE shouldn't be used as it doesn't delete anything before loading, so if you use it you'll have two copies of things. That can result in a LOT of issues, so don't use it unless you're a codermin and know what you're doing/abusing!
2017-07-29 11:43:43 +12:00
ninjanomnom
9da8be52ed fixes one bug and brings another out of the woodwork 2017-07-18 23:03:16 -04:00
ShizCalev
45d3d52af7 Made some object lists less terrible to read (#29304)
* spaces

* more spaces

* last ones
2017-07-18 10:44:29 -04:00
Kyle Spier-Swenson
a39ba1a230 Makes the map loader immune to sleeps in the shit it creates (#26219)
* Makes the map loader immune to sleeps in this shit it creates

* Fix mistake
2017-04-15 11:31:46 -06:00
AnturK
794d3e9346 Fixes holodeck areas 2017-04-08 21:53:47 +02:00
Cyberboss
9e1ef0ffe2 Global variable wrappers (#25325)
* Add the system for managed global variables

* Travis ban old globals

* So you CAN inline proccall, that's neat

* Fix that

* master.dm

* Remove the hack procs

* Move InitGlobals to the proper spot

* configuration.dm

* Fix the missing pre-slash

* clockcult.dm

* This is probably for the best

* Doy

* Fix shit

* Rest of the DEFINES tree

* Fix

* Use global. for access

* Update find_references_in_globals

Always hated that proc

Whoever made it must've bee a r e a l idiot...

* __HELPERS tree

* Move global initialization to master.

Fix the declaration

* database.dm

* Dat newline

* I said DECLARATIVE order!

* Here's something you can chew on @Iamgoofball

* game_modes.dm

* Fix this

* genetics.dm

* flavor_misc.dm

* More stuff

* Do it mso's way. Keep the controllers as global

* Make master actually see it

* Fix

* Finish _globalvars/lists

* Finish the rest of the _globalvars tree

* This is weird

* Migrate the controllers

* SLOTH -> GLOB

* Lighting globals

* round_start_time -> ticker

* PAI card list -> pai SS

* record_id_num -> static

* Diseases list -> SSdisease

* More disease globals to the SS

* More disease stuff

* Emote list

* Better and better

* Bluh

* So much stuff

* Ahh

* Wires

* dview

* station_areas

* Teleportlocs

* blood_splatter_icons

* Stuff and such

* More stuff

* RAD IO

* More stuff and such

* Blob shit

* Changeling stuff

* Add "Balance" to changelogs

* Balance for changelog compiler + Auto Tagging

* Update the PR template

* hivemind_bank

* Bip

* sacrificed

* Good shit

* Better define

* More cult shit

* Devil shit

* Gang shit

* > borers

Fix shit

* Rename the define

* Nuke

* Objectives

* Sandbox

* Multiverse sword

* Announce systems

* Stuff and such

* TC con

* Airlock

* doppllllerrrrrr

* holopads

* Shut up byond you inconsistent fuck

* Sneaky fuck

* Burp

* Bip

* Fixnshit

* Port without regard

* askdlfjs;

* asdfjasoidojfi

* Protected globals and more

* SO MANY

* ajsimkvahsaoisd

* akfdsiaopwimfeoiwafaw

* gsdfigjosidjfgiosdg

* AHHHHHHHHHHHHHHHHHHHHHHH!!!!!

* facerolll

* ASDFASDFASDF

* Removes the unused parts of dmm_suite

* WIP

* Fix quote

* asdfjauwfnkjs

* afwlunhskjfda

* asfjlaiwuefhaf

* SO CLOSE

* wwwweeeeeewwwww

* agdgmoewranwg

* HOLY MOTHER OF FUCK AND THATS JUST HALF THE JOB?!?

* Fix syntax errors

* 100 errors

* Another 100

* So many...

* Ugh

* More shit

* kilme

* Stuuuuuufffff

* ajrgmrlshio;djfa;sdkl

* jkbhkhjbmjvjmh

* soi soi soi

* butt

* TODAY WE LEARNED THAT GLOBAL AND STATIC ARE THE EXACT SAME FUCKING THING

* lllllllllllllllllllllllllllllllllllllllllll

* afsdijfiawhnflnjhnwsdfs

* yugykihlugk,kj

* time to go

* STUFFF!!!

* AAAAAAAAAAAAAAAAAHHHHHHHHHHHHHHHHHHHHHHHHHHH!!!!!!!!!!!!!!!!!!!!!!!

* ngoaijdjlfkamsdlkf

* Break time

* aufjsdklfalsjfi

* CONTROL KAY AND PRAY

* IT COMPILEELEELELAKLJFKLDAFJLKFDJLADKJHFLJKAJGAHIEJALDFJ!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

* Goteem

* Fix testing mode

* This does not belong in this PR

* Convert it to a controller

* Eh, fuck this option

* Revert controllerization Ill do it some other time

* Fix

* Working controllerization

* FOR THE LOVE OF CHRIST PROTECT THE LOGS

* Protect admins and deadmins

* Use the inbuilt proc
2017-04-06 23:26:13 -06:00
Cyberboss
58b7ce61c8 Removes the unused parts of dmm_suite (#25875) 2017-04-05 10:38:40 -03:00
Cyberboss
d94cdf9ef9 Makes a thing use a define (#25348) 2017-03-22 16:14:34 -03:00
Cyberboss
8023a02e57 Map loader optimizations (#25316)
* Cut out an unecessary locate call

* Remove an unecessary var

* Add an appropriate warning

* Move the CHECK_TICK to a more sensible place

* Change the default turf to /turf/open/space/basic

* Skip loading default turfs

* No need for CreateSpace anymore

* Improve the comment
2017-03-22 22:10:00 +13:00
Cyberboss
7816a8a1e0 Fixes the maploader being sensitive to trailing semicolons (#25275)
* Fixes #25274
2017-03-20 12:01:26 -03:00
Cyberboss
c5f01ecf9b Moves when macros are substituted in the loader 2017-03-13 16:03:18 -04:00
Cyberboss
a0df4444eb Revert the map loader optimization
Reverts #24764
2017-03-10 00:12:00 -03:00
Cyberboss
2f4fb6f68a Makes the preloader apply text macros: Re-engineering (#24614)
* Add apply_text_macros

* Make the map loader use text macros

* Cleanup
2017-03-10 09:22:34 +13:00
Cyberboss
645f3b1d75 Cuts out a chunk of map loader time for maps with a lot of space (#24764)
* SPACE OPTIMIZATION

* Don't need this instancing anymore either

* Forgot to drop this

* FASTER!!!!

* FASTER!!!!!!!!!

* Move this back, it makes no difference

* Fix a potential bug

* FAAAAAAASSSSSSTTTTTTTTERRRRRR!!!!

* open

* Ye be warned

* Better diagnostics + fixes

* Fewer false positives

* Bleh

* Remove the unecessary z-expansions
2017-03-09 11:24:51 +13: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
Cyberboss
1365ab99d8 Merges map templates and map loader (#24140)
* Reorganize the mapping code

* Finish this up

* Reee line endings

* FUCKING LINE ENDINGS

* LINARU ENDARU

* >PLS SET REPO LINE ENDINGS

* Comments

* Hoisted by my own travis.yml changes
2017-02-19 16:55:02 +13:00