coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
65,702 Commits 9 Branches 11 Tags
134094de679e3828fbd908202a9abaccda59b8ec
Commit Graph

1474 Commits

Author SHA1 Message Date
Xhuis cc62b89baf Fix bundle 2016-03-26 15:15:31 -04:00
KorPhaeron a612b73d9e Chasm Fix 2016-03-26 04:23:11 -05:00
KorPhaeron ffb0aa5655 AND AGAIN 2016-03-26 04:01:40 -05:00
AndrewJacksonThe2nd f54132e74b Foam and Conveyor Belts now process as fast as possible, Adds the Fast Process subsystem 2016-03-25 03:56:01 -07:00
duncathan salt fd36e4c090 Merge pull request #16257 from PKPenguin321/shshashaaa 
gives sand a new function
 2016-03-23 11:38:50 -06:00
KorPhaeron 9862f9b8d4 Layers 2016-03-21 17:08:14 -05:00
KorPhaeron cfe7af21e7 Mine turf cleanup 2016-03-21 15:55:31 -05:00
AndrewJacksonThe2nd 4fd7ad35ec fuck you zombiehead 2016-03-21 02:34:01 -07:00
KorPhaeron c95e64c17e Makes mine turfs less garbage 2016-03-21 03:00:51 -05:00
PKPenguin321 fb93268e5e gives sand a new function 2016-03-20 16:49:43 -07:00
Cheridan 454af7cb2d Merge pull request #16197 from KorPhaeron/crates 
Adds abandoned crates to lavaland (sort of)
 2016-03-19 21:29:18 -05:00
Cheridan 3b18b810c8 Merge pull request #16184 from KorPhaeron/sand2 
Lavaland Sand
 2016-03-19 20:22:36 -05:00
Joan Lung fe35066feb Merge pull request #16140 from KorPhaeron/fix2 
[s]Fix survival capsules (again)
 2016-03-18 22:24:34 -04:00
KorPhaeron ab263f6d90 Abandoned Crates 2016-03-18 20:54:20 -05:00
KorPhaeron db20c9cf4f Lavaland Sand 2016-03-18 14:09:30 -05:00
KorPhaeron 389bceb89a Smoothing 2016-03-17 15:58:28 -05:00
KorPhaeron 751e289921 Re-adds smoothing to lava 2016-03-17 15:49:50 -05:00
KorPhaeron db823713ae Fixes loop 2016-03-16 13:31:18 -05:00
KorPhaeron 063db968fa Fix 2016-03-15 23:14:47 -05:00
MrStonedOne 09fb8c2b10 Explosions and singulo use spiral range (and other changes) 2016-03-15 03:39:41 -07:00
Cheridan 93cb1eb0a0 Merge pull request #16033 from KorPhaeron/its_a_beta_they'll_fix_it 
Lavaland
 2016-03-14 16:47:08 -05:00
KorPhaeron 53989fffa2 Fixes turf picking 2016-03-14 14:56:32 -05:00
KorPhaeron cb6de824cb Monster Nests, more maps 2016-03-14 07:25:26 -05:00
KorPhaeron da7c8c036f Buffs mineral chances to make up for ORM 2016-03-13 21:26:16 -05:00
KorPhaeron 973b66edbb Lava Monsters 2016-03-13 20:46:51 -05:00
Cheridan 1ccaf0a1d0 Merge pull request #15991 from KorPhaeron/ore_redemption 
Ore Redemption Rescaling
 2016-03-13 15:17:33 -05:00
KorPhaeron 7955bad942 Finally kills the active turfs while retaining functioning river generation 2016-03-13 03:02:06 -05:00
KorPhaeron d367a5718c Round 2016-03-12 20:22:38 -06:00
KorPhaeron 107aced776 Last fixes hopefully 2016-03-12 16:42:14 -06:00
KorPhaeron 33ba663ee9 Fix 2016-03-12 14:58:03 -06:00
KorPhaeron 4d6b59d011 Fixes tunnels being airless 2016-03-12 14:55:11 -06:00
KorPhaeron edbf60947c Fixes tunnels being weird hopefully 2016-03-12 14:49:42 -06:00
KorPhaeron 1a385d2f2e Re-adds the gulag 2016-03-12 12:03:53 -06:00
KorPhaeron 5f8012bb45 More fixes 2016-03-12 09:16:37 -06:00
KorPhaeron 65325faff1 Fixes Z loops 2016-03-11 13:08:12 -06:00
KorPhaeron 434c729732 One more fix 2016-03-11 08:58:59 -06:00
KorPhaeron 7fa40d1e35 Yet another bugfix 2016-03-11 08:45:45 -06:00
KorPhaeron f8ec6b1142 Fixes and tweaks 2016-03-11 08:28:19 -06:00
KorPhaeron ed4f73c8d5 Capsule Exploit 2016-03-11 04:03:50 -06: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
KorPhaeron 5b36bc2f47 Temporary Chasm change 2016-03-10 22:56:11 -06:00
KorPhaeron 05c3b2d07b Test 2016-03-10 22:41:27 -06:00
duncathan 5bf31463da removes simulated turfs; adds space gas mixture for space 2016-03-10 17:27:01 -06:00
KorPhaeron 00e49f7fb2 Ore Redemption Scaling 2016-03-09 06:47:12 -06:00
c0 08bdcc3024 Plant Refactor 4 2016-03-07 12:46:12 +03:00
Cheridan f68584078c Merge pull request #15916 from Menshin/gc_destroyed2qdeleted 
Replaced last occurences of gc_destroyed by qdeleted()
 2016-03-06 12:29:30 -06:00
Joan Lung 818ec0ce96 Merge pull request #15827 from GunHog/Hardsuit_Jetpack_Upgrade_4_Miners 
Hardsuit Jetpack Upgrade
 2016-03-06 12:52:21 -05:00
KiwiFarms 9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
Cheridan 1ae539e2d1 Merge pull request #15908 from Core0verload/plantrefactor1 
Plant Refactor: It came from the Conflicts Hell
 2016-03-04 01:02:50 -06:00
c0 a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00