Commit Graph

154 Commits

Author SHA1 Message Date
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
xxalpha
fa9c795813 mapmerge creates edited map before merge backups 2016-05-12 21:38:47 +01:00
Kyle Spier-Swenson
49e78d7d04 Fixes the changelog processor not escaping usernames. (#17486) 2016-05-11 17:54:21 -05:00
xxalpha
ce38112356 Fixed mapmerger writing the last X incorrectly. 2016-05-08 18:15:53 +01:00
MrStonedOne
a6ff9b17c9 Improves the Runtime Condenser.
* Progress bar for when reading in larger runtimes.

* Runtimes with identical text but from separate procs (ie, the million of null.name runtimes we have) are now considered separate runtimes.

* Speed was improved by using pointers for the line holders so we don't copy the characters as we move to the next line needlessly and by not using pointers for the stored runtimes so they can be searched and accessed quicker (cpucache)

* File read rate was massively improved by using a buffered read rather then file.getline() to lower on IO calls. It will now read 512KiB at a time and filter the lines from that buffer as it goes along.

* Pressing just enter at the exit prompt will now be recognized properly.
2016-05-06 16:09:28 -07:00
Jack Edge
85173e3b63 Polite warnings, total printing 2016-05-04 16:12:33 +01:00
Jack Edge
6c879aa414 Using libraries is good yo 2016-05-04 15:53:13 +01:00
Jack Edge
c3c5bac2d1 Counts duplicated tiles 2016-05-04 15:50:31 +01:00
Jack Edge
73ae350537 Created simple maintloot counter
How much maint loot is there? This quickly hacked together python script
will tell you. Give it a map name, and wait.
2016-05-04 15:40:27 +01:00
Cheridan
6e12fa2ea8 Merge pull request #17230 from MrStonedOne/runtimeCondenserFix
Refactor the Runtime Condenser to be less shit.
2016-04-30 05:33:58 -05:00
MrStonedOne
d5f3d025a8 Final cleanup and optimizations 2016-04-29 23:37:04 -07:00
MrStonedOne
aa6b32020d Fixes reporting for hard deletes and cleans up dunc's code. 2016-04-29 02:00:38 -07:00
MrStonedOne
0ec8de7705 Refactor the Runtime Condenser to be less shit. 2016-04-28 23:32:05 -07:00
Razharas
bbcd34569f Merge pull request #17001 from optimumtact/timecops
Time filter added to changelog tool
2016-04-26 01:29:35 +03:00
oranges
3a67251ebf Time filter added to changelog tool
You can now use -t <int> to determine how many weeks back the
generated html changelog should go. The default is set to 4

Long form of the argument is supported as --time-period
2016-04-21 23:41:29 +00:00
YotaXP
60047d0e44 Made mapmerge slightly less of a pain 2016-04-18 19:22:51 -04:00
duncathan
3f1375ba39 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	_maps/RandomZLevels/Cabin.dmm
	_maps/RandomZLevels/beach2.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/templates/lavaland_surface_automated_trade_outpost.dmm
	_maps/templates/lavaland_surface_biodome_winter.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	code/controllers/subsystem/air.dm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/effects/aliens.dm
	code/game/objects/effects/overlays.dm
	code/game/objects/items/apc_frame.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/girders.dm
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/mineral_floor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/simulated/river.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/simulated/walls_reinforced.dm
	code/modules/admin/verbs/buildmode.dm
	code/modules/atmospherics/environmental/LINDA_turf_tile.dm
	code/modules/events/spacevine.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/holodeck/turfs.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/interactive.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/bot/floorbot.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/singularity/narsie.dm
	code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
	code/modules/research/server.dm
2016-03-29 14:46:06 -06:00
duncathan
b9950c4358 turf/open and turf/closed 2016-03-29 13:38:56 -06:00
Kyle Spier-Swenson
766db108e4 Update github_webhook_processor.php 2016-03-28 13:08:21 -07:00
Kyle Spier-Swenson
e3eac6f3d5 Makes changelog generator send changelog to target branch
For some reason I was sure this was included in $payload['pull_request']['base']['repo']['url'], but i was wrong.
2016-03-28 12:53:26 -07:00
Cheridan
1ad1cf6bb7 Merge pull request #15797 from tkdrg/neodenser
Adds a python version of the runtime condenser
2016-03-19 21:38:50 -05:00
duncathan
12a6205372 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	_maps/RandomRuins/SpaceRuins/asteroid4.dmm
	_maps/RandomRuins/SpaceRuins/spacebar.dmm
	_maps/RandomZLevels/Academy.dmm
	_maps/RandomZLevels/beach.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/spacebattle.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/RandomZLevels/wildwest.dmm
	_maps/map_files/AsteroidStation/AsteroidStation.dmm
	_maps/map_files/BirdStation/BirdStation.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/DreamStation/z5.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/map_files/generic/z5.dmm
	_maps/map_files/generic/z6.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	_maps/templates/lavaland_surface_ufo_crash.dmm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/structures/lattice.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/misc_floor.dm
	code/game/turfs/simulated/floor/plasteel_floor.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/mulebot.dm
	code/modules/mob/mob_movement.dm
2016-03-10 23:07:21 -06:00
duncathan
5bf31463da removes simulated turfs; adds space gas mixture for space 2016-03-10 17:27:01 -06:00
xxalpha
d16f73add0 Tuples 2016-03-10 02:10:53 +00:00
xxalpha
fa9dba4e67 Fixed bug that caused duplicate entries. Reduced line changes.
clean
2016-03-05 18:50:40 +00:00