Commit Graph

178 Commits

Author SHA1 Message Date
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
xxalpha
33973ae2fa Added try catch block to handle duplicate keys. 2017-02-19 16:25:30 +00:00
xxalpha
f4c8aa63e0 Tweak dictionary trimming threshold value. 2017-02-16 13:18:48 +00:00
Kyle Spier-Swenson
b8b85f7b7b send payload to server (#24008) 2017-02-13 08:42:38 +01:00
oranges
2ef3f911c3 Merge pull request #23661 from xxalpha/mapfixfix
Map fixer patch - argument default
2017-02-06 00:21:22 +13:00
oranges
a45c147ba0 Merge pull request #23631 from AnturK/scriptfix
Fixes path updater script
2017-02-04 16:42:32 +13:00
oranges
d12a6b4aa4 Merge pull request #23561 from Cyberboss/global_roundup
Adds a global var finder. Makes find_references search globals
2017-02-04 16:35:45 +13:00
oranges
4b0e86b44d Merge pull request #23562 from Cyberboss/TravisTesting
Makes travis build the testing configuration
2017-02-04 16:34:40 +13:00
xxalpha
f8312c20a5 Dictionary writing function 'header' argument now defaults to None. 2017-02-03 15:23:35 +00:00
oranges
15419d92e5 Merge pull request #23643 from xxalpha/mapmerge152
Map merger patch - comments!
2017-02-03 11:24:56 +13:00
xxalpha
19cae80770 Modified parse_maps() to support map comments. 2017-02-02 21:58:13 +00:00
AnturK
2b620e8445 Fixes path updater 2017-02-02 13:11:12 +01:00
Cyberboss
afc02ef43b Makes travis build the testing configuration 2017-01-31 15:13:53 -05:00
Cyberboss
d331bee6e2 Add DMTreeToGlobalsList 2017-01-31 12:24:36 -05:00
AnturK
6470464ec1 Map Decals v.2 (#23385)
Simple decal system to replace turf stacking and icon state duplication.
Plus simple script to help with path updates that are bit more complicated that search&replace.
Fixes caution tiles turning into space.
Fixes flipped corner decals.
Fixes gas list property whitespace on replacing.
2017-01-30 10:20:39 +13:00
xxalpha
54c903c970 Map merger patch - dictionary trimming (#23231)
* Map dictionary trimming is now functional.

Map dictionary trimming is now functional now functional.

Map dictionary trimming is now functional is now functional is now
functional.

Fixed missing arguments.

Increased unused keys trigger threshold.

* Trimming now adds a date stamp to the file as a header.
2017-01-30 09:53:37 +13:00
Leo
2947408e09 Revert "Turf decals + path update helper" 2017-01-26 17:03:25 -02:00
AnturK
bf20de19f6 Turf decals + path update helper (#22887)
* Decal + Path update helper initial

* decal definitions

* Changes

* Updated script

* Bugfix & some pep8

* Default paths in filter rules

* return to crash

* Removes unused paths.

* Removes redundant icon_states

* capitals

* Maps v6 - run out of comments
2017-01-26 22:59:17 +11:00
MrStonedOne
50ed427d6f Fuck it, lets do the templates too. 2017-01-19 22:56:41 -08:00
xxalpha
832a7c2518 Comment out code that needs to be fixed after xmas 2016-12-25 12:00:12 +00:00
xxalpha
8e80afbf86 Map Conflict Fixing Helper (#22421)
* Trimmed down map_merge function to be simpler and straightforward, no
more recycling keys;
New function get_key, looks up a dict key by abusing python;
New function key_int_value, converts a base 52 key to a base 10 integer
value;
Map helper functions are no longer dependent on global values;
Reorganized map_helpers.py;

* Added Map Conflict Fixer Helper;
Changed parse_map function to accept a map's raw text instead of a file
path;
Tweaked some map merger code;

* Map Conflict Fixer readme.md entry

completed readme.md

more

Removed debug code
2016-12-25 16:25:54 +13:00
Remie Richards
1606e63a3f Adds a tool to cut up an input dmi into a smoothing dmi (#22082)
* Adds a tool to cut up an input dmi into a smoothing dmi

* Now handles (New) diagonals! Now includes ExampleDiagInput.dmi, No longer strict on number of states, but instead queries the user.
2016-12-13 14:41:45 +13:00
Remie Richards
49e1f4cc94 Adds a tool to find Unquoted List Associations 2016-11-27 00:31:41 +00:00
Oisin100
cad6d29c19 Fixes Unicode CL tags breaking changelogs. 2016-11-23 22:47:33 +00:00
MrStonedOne
44f5632299 Adds config option for hub, removes hub.dm, adds toggle hub admin verb 2016-10-08 17:47:37 -07:00
xxalpha
b1183e4bbe [mapmerger] load python version test before everything else 2016-08-28 19:25:18 +01:00
oranges
5cea7a9305 Simple mapmerger readme
basic guide and some troubleshooting

It's not like most people read these commit logs anyway, first person to notice this gets a 10 dollar amazon voucher, pm me in irc with the commit hash.
2016-07-30 01:20:52 +00:00
Iamgoofball
6843fc1e55 Adds mapmerger readme 2016-07-28 08:40:57 +02:00
xxalpha
968c0b6fb6 Added a Python version check to map_helpers.py.
logic for retards
2016-07-26 20:42:10 +01:00
coiax
afb7ebd790 Tiles are now (mostly) pooled objects (#19112)
* Tiles are now (mostly) pooled objects

Floors no longer have a builtin_tile, but instead use PoolOrNew().

Also added a do-nothing SSpool so you can inspect the global pool.

* Entries for time keeping

* MORE STATISTICS

* Stat tracking, auto filling

* Code review I

* Code review II

* Code review III
2016-07-08 13:32:40 -04:00
xxalpha
9a30e04bce Patched a mapmerger bug where it would incorrectly recycle keys. 2016-07-02 16:24:06 +01:00
Jack Edge
423f17c571 Repaths a bunch of plants 2016-06-22 21:15:44 +01:00
Jack Edge
676106ba92 Travis now checks templates 2016-06-22 20:53:24 +01:00
Kyle Spier-Swenson
5668a89da4 Revert "Remove three unused tools" (#18602)
Restore tools as they are used
2016-06-17 09:38:38 +12:00
Kyle Spier-Swenson
640a81daa1 Fixes changelog generator's handling of odd names in author field
tested and works with :, its escaped so it will work with " and \ too
2016-06-10 04:15:32 -07:00
Joan Lung
08f88fbe3e Merge pull request #18159 from coiax/countdown
Adds ghost visible countdowns for bombs
2016-06-03 08:55:11 -04:00
oranges
28f790eae0 Improves travis script error checker
This prevents builds passing when they are a multiple of 10
2016-06-03 08:51:20 +00:00
oranges
e83d8da7ec Better travis build
This should stop travis not failing maps with bad edits.
2016-06-03 20:08:52 +12:00
Jack Edge
2df2c6334f Adds ghost visible countdowns for bombs
🆑 coiax
rscadd: For extra observer drama, ghosts can now visibly see the
countdown of various explosives.
/🆑

- Also updates my build script to take account of the move of dm.sh
2016-06-02 11:06:59 +01:00
Jordie
488e15232b Merge pull request #18116 from optimumtact/forwhatpurpose
Make changelog build commits not trigger a travis build
2016-06-01 22:06:01 +10:00
oranges
3d26a4996a Added a space before the skip tag
Makes it more readable and makes github treat #num as a pr/issue link correctly
2016-06-01 19:24:57 +12:00
oranges
89a3c304d1 Refactors travis building
Tools (tgui and changelog) are split out into their own build and are not
installed/built in the standard per map build, this should give developers
better visibility on if it's a tool breakage, or their code is faulty

This also moves most of the travis related scripts into a single folder
this is entirely for sanity reasons, they've also all be made user
executeable
2016-06-01 06:59:47 +00:00
oranges
2027f0006f Make changelog build commits not trigger a travis build
There is no reason to build tests on these as they are automated
and not often checked, plus, they do not modify code and the
changelog yaml should already be verified when it was merged

[ci skip]
2016-06-01 00:30:47 +00:00
Kyle Spier-Swenson
34d3e359a8 Changes default time filter for the changelog to 9 weeks from 4 weeks 2016-05-29 20:56:18 -07:00
Jack Edge
3910a546e6 Adds admin logging to megafauna movement
🆑 coiax
rscadd: Admins are now notified if a megafauna uses a wormhole or a
shuttle.
rscadd: A new Shuttle Manipulator verb has been added for quick access
to probably the best and most bugfree feature on /tg/.
/🆑

Megafauna adminnotifies on portal TP

Standard shuttle names and logging

Also ignore .mdme files

Muh commit

Actually works and stuff
2016-05-28 16:26:28 +01:00
oranges
74973a210a Merge pull request #17945 from MrStonedOne/patch-204
Make the github webhook secret required for the webhook processor to avoid security issues
2016-05-27 09:09:18 +12:00
coiax
4483d5275c Shuttle manipulator (#17436)
* Starting out on our tgui journey

* God tgui, why do you need to be updated

You're dynamically generated anyway

* Commit of stuff

* Further progress is being made

* Everyone loves buildscripts

* Further modifications to my incredible running script

* Starting to modify the minimap code to be better

* It's going well thusfar, I guess

* What have I done

* RIP minimap

* FUN FUN FUN FUN FUN

* Adds shuttle_manipulator.dmi

MUH HOLOGRAMS

* Is it done? IS IT OVER

* Peer review

* Some bug fixes

* Makes that damn greentext shut up

* Shuttle registration

* Made the Emergency Escape Bar more robust

No climbing on the bar.

* Do not stare into the operation end of the device

* Compile shame

* THE MOST DUMB

* Passive barmaiden

* Emergency shuttle memes

* MORE SAFETY CODE

* Fancy shuttle manipulator icons

* Smoothing it out

* We are going to have a lot of fun with this one

* Independent blobbernauts

* WABBAJACK WABBAJACK

* Message for attempting to authenticate old style

* Angry alert noise is back

* Revert "Independent blobbernauts"

This reverts commit 34d6af7c9c88cfc2864990cb37b586bb90163dd3.

* No parrot sleep plz

* Moves the special shuttle stuff to special.dm

* No Bartender like a Centcom Bartender

* Non-controversial map changes

- Backup shuttle moved closer to Centcom main structure, docking tube
created
- Moved shuttle import landmark to above Centcom main building
- Added shuttle displays to Conference Room
- Squashed the Chapel a bit in Metastation
- Made the docking port on Z2 massive
- Made the docking port on Metastation a lot larger

* Hacks and slashes at Box

A bunch of things are extended and squashed so Box shuttle dock can
support the MetaStation emergency shuttle.

* Some Metastationshit

* Never ending changes

* Wabbajack to TGM

* Modified the bar, I think that's all of them

* Stops Barmaiden wandering around

* More code review

* Whitspace, the bane of us all

* DIE WHITESPACE DIE
2016-05-26 15:15:19 +02:00
Kyle Spier-Swenson
09a0f00456 Make the github webhook secret required for the webhook processor to avoid security issues
I already use this, but it occurred to me that without hooksecret, that somebody could craft a fake event with a "changelog" and a `$payload['pull_request']['base']['repo']['url']` set to a script they controlled, and use that to extract the private key.
2016-05-26 04:44:07 -07:00
oranges
f0be710959 Merge pull request #17440 from MrStonedOne/RuntimeCondenserImprovements
[Ready]Improves the Runtime Condenser.
2016-05-25 10:18:49 +12:00
MrStonedOne
9f0e951a69 Fixes handling of line endings and it not incrementing runtime count correctly 2016-05-24 15:13:48 -07:00