coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
28,889 Commits 9 Branches 11 Tags
bcdb01caba254be432913bba586c4aa0ddc45fb2
Commit Graph

253 Commits

Author SHA1 Message Date
tkdrg bff752a69a Merge pull request #14513 from KorPhaeron/why 
Removes teleport scroll from snowdin
 2016-01-09 12:39:23 -03:00
KorPhaeron 7bafb9e1fd Snowdin 2016-01-08 07:37:57 -06:00
Tkdrg 5589ac7559 Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework" 
This reverts commit 52a45b6292, reversing
changes made to 19b43ba668.

Conflicts:
	code/datums/mind.dm
 2016-01-07 23:15:35 -03:00
tkdrg bc8e46b8a3 Merge pull request #14440 from MrStonedOne/patch-119 
Fixes map loader not initializing map edited path/type vars
 2016-01-07 20:28:56 -03:00
tkdrg 3412e83c17 Merge pull request #14420 from KorPhaeron/gate 
Fixes driving ATVs through gateways
 2016-01-06 18:51:17 -03:00
Kyle Spier-Swenson 196c98e056 Fixes map loader not initializing map edited path/type vars 2016-01-06 03:54:03 -08:00
KorPhaeron e2b09f5604 Gate Fix 2016-01-05 13:56:26 -06:00
AnturK 4a3324b673 Adds away areas to ghost teleport/ admin jump list 2016-01-03 20:25:48 +01:00
tkdrg 926fe760b6 Merge pull request #14286 from KorPhaeron/cheribucks_secured 
Fixes away mission area names
 2016-01-03 02:58:22 -03:00
Cheridan 717ac13557 Merge pull request #14262 from xxalpha/smoothballs 
Refixes loaded map smoothing
 2016-01-02 16:58:07 -06:00
MMMiracles 1171d9d3fc spellingishard 2016-01-02 00:59:53 -05:00
KorPhaeron 9466b33819 Fixes the other away missions 2016-01-01 23:49:42 -06:00
KorPhaeron 7ccce98b6e CHERIBUCKS 2016-01-01 23:45:19 -06:00
MMMiracles 2be090aee1 Merge branch 'master' of https://github.com/tgstation/-tg-station into geneticsishard 2016-01-01 15:03:45 -05:00
xxalpha e24f69a359 Refixes loaded map smoothing 2016-01-01 19:49:51 +00:00
tkdrg 0d0210c951 Merge pull request #14197 from KorPhaeron/snowdin 
Allows ghost spawners to implant the new mob
 2016-01-01 16:31:53 -03:00
tkdrg 2e35147972 Merge pull request #14199 from KorPhaeron/away 
Fixes the away mission loader always choosing the same map
 2016-01-01 16:31:21 -03:00
KorPhaeron efc4df456e Poor indent 2015-12-31 11:37:51 -06:00
KorPhaeron 9c8a0cb0a5 Implant 2015-12-31 10:47:33 -06:00
tkdrg 52a45b6292 Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework 
OBJECTIVES REWORK: Better Objectives Generation
 2015-12-31 03:11:41 -03:00
tkdrg 7090e124dd Merge pull request #13802 from KorPhaeron/random_ruin 
Random ruins for space/lavaland [ready for review]
 2015-12-28 18:40:13 -03:00
AndrewJacksonThe2nd dca91323a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into objectives_rework 
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/objective.dm
	data/mode.txt
 2015-12-28 12:40:51 -08:00
KorPhaeron f312f65aad anti-infinite loop 2015-12-28 09:38:41 -06:00
tkdrg 9e7c05e557 Merge pull request #14000 from KorPhaeron/pamphlet 
Fixes away mission pamphlet desc
 2015-12-25 21:07:21 -03:00
KorPhaeron fad47ae801 missing space 2015-12-25 17:33:33 -06:00
duncathan salt 6b4000ff66 Merge pull request #13956 from MrStonedOne/patch-98 
gateways now pause movement briefly to prevent chain teleports
 2015-12-24 15:06:26 +01:00
KorPhaeron 447c9c3c87 Fixes pamphlet desc 2015-12-24 07:50:52 -06:00
Kyle Spier-Swenson 92d727fe99 Update gateway.dm 2015-12-24 04:40:45 -08:00
Kyle Spier-Swenson 3207c2f2aa fixes gateway move delay typo 2015-12-23 01:58:35 -08:00
Kyle Spier-Swenson 537d638042 gateways now pause movement briefly to prevent chain teleports 2015-12-23 01:29:37 -08:00
MMMiracles 1c1e892ddf New Away Mission: Research Facility 2015-12-22 17:34:04 -05:00
Remie Richards 38c6af7032 Improves the speed of the for()loops in the maploader procs, Removes assumptions that the coordinates exist (NO MORE RUNTIMES AT MAP EDGES WOOO!) 2015-12-20 22:46:25 +00:00
KorPhaeron de154b8fda Runtime fix 2015-12-19 09:17:39 -06:00
KorPhaeron 567e4a8e6e Removes commented out code 2015-12-19 06:56:50 -06:00
KorPhaeron 5201b77495 Random Ruins 2015-12-19 06:55:50 -06:00
tkdrg 77928440e2 Merge pull request #13571 from KorPhaeron/gate_destruction 
Gateway/singularity interaction fix
 2015-12-18 00:23:23 -03:00
KorPhaeron 2e57936f94 Fixes gateway interaction 2015-12-17 21:12:30 -06:00
tkdrg f93aac3cab Merge pull request #13687 from Buggy123/master 
Reduces cooldown of the Bluespace Artillery on the space battle away mission
 2015-12-17 20:25:25 -03:00
Buggy123 292e5ea424 Update bluespaceartillery.dm 2015-12-17 17:16:59 -05:00
KorPhaeron 5ee7c1a0b4 Fixes gateway checks 2015-12-17 01:45:09 -06:00
oranges 134a76cc8f Line ending apocalypse 2015-12-17 14:12:37 +13:00
MMMiracles cde4df61ae conFLICTS 2015-12-16 06:26:54 -05:00
Jordie adf0f7b416 Merge pull request #13596 from MMMiracles/thenaskeletonpoppedout 
Makes the zombie and skeleton corpsespawners actually make zombies and skeletons
 2015-12-16 21:27:07 +11:00
Buggy123 41fb4c9576 Update bluespaceartillery.dm 2015-12-15 23:31:07 -05:00
Buggy123 9515e5dd98 Update bluespaceartillery.dm 2015-12-15 23:05:59 -05:00
Buggy123 f9e6eacb31 Update bluespaceartillery.dm 2015-12-15 23:05:49 -05:00
Buggy123 557b52bb76 Update bluespaceartillery.dm 2015-12-15 23:03:39 -05:00
MMMiracles 55ebaf3bdb snow stuff i guess 2015-12-15 17:33:34 -05:00
MMMiracles 392ca2a505 Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold 2015-12-15 16:54:22 -05:00
MMMiracles d07f300063 i did things 2015-12-15 16:46:24 -05:00