cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 09:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,265 Commits 61 Branches 14 Tags
6e27f01c94de6f69d1f0ac3afb181bdea2532d6a
Commit Graph

116 Commits

Author SHA1 Message Date
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
xxalpha
e2aca9914b Two batch files to run map merge. Fixed output error when in non-tgm mode. 2016-03-01 23:42:44 +00:00
Tkdrg
a18c4a9edb Adds a python version of the runtime condenser 
It's still full of copy-paste but it should hopefully be easier to
extend. Performance-wise it's about the same speed as the C++ one on my
machine (!), mostly due to structural improvements such as using a hash
table instead of an array. It does consume more memory however.
 2016-02-27 15:59:11 -03:00
xxalpha
f0c1389787 Fixed mapmerger not using index 0 from map list. 2016-02-27 06:23:25 +00:00
xxalpha
be29040b96 parser will now ignore preceding whitespace in var blocks; removed unused 
file

penis
 2016-02-26 01:06:34 +00:00
xxalpha
1d01666ec7 Added new format function; patched parser to read new format 2016-02-24 04:23:20 +00:00
xxalpha
c648d31039 Rewrote parser; added functions for writing in tgm and inflated format. 2016-02-24 00:27:27 +00:00
xxalpha
53735f3343 Improved search_data() speed. 2016-02-22 17:24:10 +00:00
xxalpha
00323d64d1 pythony 2016-02-22 16:52:14 +00:00
xxalpha
1ca98ff016 Fixed bad loop. merge_map() will now find sequence gaps and fill them.. 2016-02-18 17:04:50 +00:00
xxalpha
7883832706 Separated wrapper from map processing functions. 2016-02-17 17:29:27 +00:00
xxalpha
3082d3107d Fixed merging multiple maps causing index error. 2016-02-15 20:16:20 +00:00
xxalpha
02c382bf30 New map merging tool. 2016-02-15 18:36:59 +00:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Kyle Spier-Swenson
c9e2860777 Fixes github webhook not working on apache 2016-01-19 10:47:41 -08:00
Firecage
754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
Kyle Spier-Swenson
9b8abaee4e Adds pr announcer/changelog generator github webhook script to tools folder. 2016-01-03 11:08:30 -08:00
Tkdrg
553ce69257 Adds the dmitool icon merger from baystation12 
Credits to GinjaNinja32@bay12 for developing dmitool and
PsiOmegaDelta@bay12 for some of these scripts. Thanks also to
neersighted for reminding me that we need this.

Basically this is like the map merger, except for icons. You can install
a hook using the instructions in the dmitool folder, and it should
automatically merge your DMIs for you. This means you can solve icon
conflicts effortlessly most of the time.
 2015-11-28 03:47:26 -03:00
Razharas
c525635c38 Merge pull request #12446 from duncathan/patch-1 
makes the condensed hard del logs less spammy
 2015-11-07 06:14:10 +03:00
Remie Richards
d511984471 Adds a tool, ColonCatcher.py that locates all Colons that are used to avoid typesafety (A:B) or are used in the ternary operator (prob(50) ? "A" : "B") 2015-10-25 00:31:07 +01:00
duncathan
9e8fa0fd7f makes the condensed hard del logs less spammy 2015-10-16 15:09:53 -06:00
Razharas
ca0df28f9a Merge pull request #12287 from Jordie0608/equalityforalldmmfiles 
Prepare Maps.bat for entire _maps directory
 2015-10-12 12:19:04 +03:00
Jordie
5282d88557 changed to use _maps directory 2015-10-10 17:51:12 +11:00
Razharas
0ad7257a52 Merge pull request #12089 from MrStonedOne/maprotation 
HOLY FUCKING SHIT, I'VE DONE IT! Map rotation!
 2015-10-07 07:53:42 +03:00
MrStonedOne
ef4321c62b Fixes added spam in server-tools's copyfromgit.bat 2015-10-06 21:26:53 -07:00
MrStonedOne
f83d5c92b8 Fixes typo in batch file. if exists -> if exist 2015-10-06 21:25:04 -07:00
MrStonedOne
e27e9e8371 Map rotation fixes: 
Fixes mutiple rotate operations from breaking the server, map rotation will properly detect rotation operations as well as update operations and abort.
Fixes max pop being treated as minpop
Adds more feedback to admin verbs.
 2015-10-06 21:12:00 -07:00
duncathan
4cacbf216b recompiles RuntimeCondenser.exe 2015-10-06 17:24:53 -06:00
duncathan
983132b61f adds sorting (descending by failures); fixes output 2015-10-05 20:12:05 -06:00
duncathan
e2ed83b6a5 adds the del() log to world.log at roundend and allows the runtime condenser to parse and condense it 2015-10-05 18:52:44 -06:00
Razharas
16c8eac8e3 Merge pull request #11826 from optimumtact/cleanuptools 
Remove three unused tools
 2015-10-01 23:24:04 +03:00
MrStonedOne
9741f1d223 Fixed maprotate batch script having wrong exit codes 2015-10-01 04:10:49 -07:00
oranges
3e6399caa4 Remove two unused tools 2015-10-01 09:35:37 +13:00
MrStonedOne
fcc8402f31 map rotation base code 2015-09-30 07:13:38 -07:00
oranges
2155207c8d Add a tool to ensure no excess file dirs are defined 
Also plugs script into the travis buildchain
 2015-09-17 11:43:18 +12:00
CorruptComputer
d27a736f7e Fixes #11301 2015-08-21 16:57:27 -05:00
CorruptComputer
c241ce4502 Added the exe 2015-07-28 17:04:07 -05:00
CorruptComputer
4516db6323 IT WORKS 2015-07-26 10:54:16 -05:00
Remie Richards
66689dbb51 Adds a tool to convert the internal structure of a .dmm (or .txt form) of a Byond map into a human readable format, this format is also more suited to automatic fixing of conflicts by Git! 2015-07-14 19:47:46 +01:00