coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
32,767 Commits 9 Branches 11 Tags
6a2df04760db0808973a2ceea26ab2e89bb130aa
Commit Graph

793 Commits

Author SHA1 Message Date
Cheridan 2f52e7daf9 Merge pull request #16829 from erwgd/LetUsMakeDinnerware 
New autolathe category for kitchen+bar items
 2016-04-14 11:56:21 -05:00
erwgd 9d6247c890 Removed bowl making code from biogenerator.dm 
Added bowl design to autolathe_designs.dm
Changed bowl materials to 500 glass
 2016-04-14 17:14:01 +01:00
Joan Lung d8a724f1c4 Merge pull request #16806 from coiax/airlock-painter 
Airlock painter now printable in autolathe; plus meme suicides
 2016-04-14 09:29:10 -04:00
erwgd ca88d3f025 added shot glass and shaker designs to autolathe 
defined materials for shot glass and shaker
 2016-04-13 17:17:15 +01:00
AnturK 4b7f274e3f Merge pull request #16742 from Core0verload/master 
Cargo Exports (and a very basic economy system)
 2016-04-13 17:41:05 +02:00
KorPhaeron 62939a09f0 Merge pull request #16733 from octareenroon91/patch-35 
Add Drone Shell to Protolathe for ease of exporting drone data disks to autolathes
 2016-04-12 23:54:47 -05:00
c0 04f1aafa78 Exports 2016-04-13 06:01:40 +03:00
Joan Lung b0d6771903 Merge pull request #16694 from Fox-McCloud/xenobio-tweaks 
Xenobio Additions and Tweaks
 2016-04-12 20:57:50 -04:00
erwgd 0078f91d8a Added hacked autolathe design for butcher cleaver 
Defined materials for butcher cleaver
 2016-04-12 20:01:26 +01:00
erwgd f0a6af827e Added bowl design to biogenerator.dm 
Added recipes for fork and drinking glass to autolathe_designs.dm
Defined materials for fork, bowl, drinking glass
 2016-04-12 19:39:09 +01:00
erwgd 73be1a80c0 Created Dinnerware category for autolathe 
Changed category of kitchen knife from "Misc." to "Dinnerware"
 2016-04-11 22:19:15 +01:00
Jack Edge 115d32a357 Adds airlock painter to autolathe designs 2016-04-11 11:54:45 +01:00
KorPhaeron 82786783f4 Merge pull request #16716 from coiax/plant-genes 
Added a "plant DNA manipulator" to Botany backroom
 2016-04-08 16:34:34 -05:00
Jack Edge 0465ea35f8 Fixed inaccurate description of design item 2016-04-08 22:25:05 +01:00
Jack Edge d3d4b43e6a Added plant data disks to Protolathe 
Print out some botany data disks if they ask nicely.
 2016-04-08 10:34:21 +01:00
Jack Edge 452577a9dd Added plant DNA circuit board to imprinter designs 
As above.
 2016-04-08 10:22:46 +01:00
octareenroon91 00984ac291 Add Drone Shell to Protolathe 
Drone shell constructable from protolathe
 2016-04-07 21:31:25 -05:00
AnturK 80eb5833e9 Merge pull request #16470 from KorPhaeron/accelerator 
Laser Cannon Changes
 2016-04-07 18:51:18 +02:00
Fox-McCloud 14d611ecc1 Xenobio Additions and Tweaks 2016-04-06 22:36:58 -04:00
Cheridan fe73fc2b58 Merge pull request #16664 from erwgd/PortaseederDesign 
Adds portable seed extractor to protolathe designs
 2016-04-06 13:23:40 -05:00
Cheridan 457888ce0b Merge pull request #16628 from erwgd/AutolatheMakeHydroTools 
Adds hydroponics tools and shovels to autolathe_designs.dm
 2016-04-05 19:35:47 -05:00
AnturK 3d9c0e3d66 Merge pull request #16584 from MrStonedOne/patch-183 
Better sleep()s for procs that abuse it
 2016-04-05 21:03:30 +02:00
Joan Lung 43471f70f7 Merge pull request #16627 from erwgd/AutoLatheMakeToolbox 
Add toolbox to autolathe_designs.dm
 2016-04-05 14:13:46 -04:00
MrStonedOne 5098a3c884 Made more sleeps use stoplag 
This buffs a few things, but makes them handle lag better and tick at the rate of world.tick_lag without causing lag
 2016-04-05 11:08:28 -07:00
erwgd 66a12a9233 added portable seed extractor to designs.dm 2016-04-05 18:14:47 +01:00
Cheridan 4f4a52e206 Merge pull request #16583 from KorPhaeron/rd_fix 
Fixes RD machine speed
 2016-04-04 18:07:22 -05:00
erwgd 529309e6ab Added hatchet datum to autolathe_designs.dm, formatting in autolathe_designs.dm and hydroitemdefines.dm 2016-04-04 21:20:03 +01:00
erwgd 1ab2e4a7bd Added hydroponics tools to autolathe_designs.dm 2016-04-04 15:23:49 +01:00
erwgd 406b7307cc added toolbox to autolathe_designs.dm 2016-04-04 14:19:02 +01:00
duncathan a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2016-04-03 18:22:20 -06:00
KorPhaeron e632d78846 RD Fix 2016-04-02 11:21:49 -05: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
KorPhaeron 177c4c18f8 Accelerator Cannon 2016-03-29 00:44:39 -05:00
KorPhaeron 26bce514d5 GOOF IN CHARGE OF MATH 2016-03-26 06:12:44 -05:00
PKPenguin321 03198df8a8 removes evil fucking comma from experimentor.dm 
jesus fuck this thing annoyed me every single god damn time i saw it and i am so glad i am finally removing it
 2016-03-19 22:24:03 -07:00
Remie Richards f21d675fbe Merge pull request #15849 from Core0verload/jetpack 
Jetpack nerf revert, new jetpack implant
 2016-03-17 00:59:23 +00:00
c0 8dfef3b793 fix 2016-03-12 15:07:33 +03:00
c0 9a3276c784 Alien Alloys in RnD 2016-03-12 15:07:32 +03:00
c0 52d91c0cf9 Abductor Tech added to RnD 2016-03-12 15:07:30 +03:00
c0 6b7774a1de fixes 2016-03-11 09:52:20 +03: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
c0 c6932a37e6 Jetpack nerf revert, new jetpack implant 2016-03-04 14:06:12 +03:00
c0 6c9be9c82d Adds breathing tube implant, changes how heart works, reworks arm-mounted implants 2016-02-25 12:50:45 +03:00
AnturK ceb9af945c Removes typo. 
Makes Load Template verb get turf after input.
 2016-02-20 18:12:20 +01:00
AnturK 1a59dbaee1 Fixes Experimentor runtime 2016-02-20 15:39:15 +01:00
AnturK 46597f41f6 Bit more flat 2016-02-14 17:39:44 +01:00
AnturK 3ec50ed2cf Simple reliability fix 2016-02-14 12:12:36 +01:00
tkdrg 2bb9ced33f Merge pull request #15471 from Firecage/fixesbiobags 
This fixes biobags picking up slime cores/extracts.
 2016-02-13 17:25:59 -03:00