coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
32,612 Commits 9 Branches 11 Tags
3dd20078aefe68f252bc385a1663f88abe5ca5a9
Commit Graph

4598 Commits

Author SHA1 Message Date
PKPenguin321 2ecb556e94 addresses minor feedback, fixes implant 
krav maga implant now works 100%
trailing returns and a useless if() removed
 2016-04-14 22:49:29 -07:00
PKPenguin321 c86e390caf adds krav maga 2016-04-12 18:30:14 -07:00
KorPhaeron c907776872 Merge pull request #16814 from erwgd/PlankMakeRollingPin 
Add rolling pin datum to wooden plank recipes
 2016-04-12 17:29:26 -05:00
KorPhaeron 4c8ea85b59 Merge pull request #16810 from Shadowlight213/giftsprite 
Fixes gift sprite
 2016-04-12 17:19:49 -05:00
Cheridan 9e85fe81be Merge pull request #16743 from TrustyGun/flask 
Changes Flasks a little
 2016-04-12 00:03:19 -05:00
erwgd dbae4b78e0 2 planks are needed to craft rolling pin 2016-04-11 22:41:03 +01:00
erwgd 249a81dd15 Update sheet_types.dm 
changed planks required from 10 to 1 to make rolling pin
 2016-04-11 22:37:46 +01:00
erwgd b2eea7769f Added rolling pin recipe datum to wooden plank 2016-04-11 21:40:44 +01:00
Shadowlight213 89b0b3c50e Fixes gift sprite 2016-04-11 11:32:32 -07:00
RandomMarine 9a6b11e785 Merge branch 'master' of https://github.com/tgstation/-tg-station into golemship 
# Conflicts:
#	config/admins.txt
 2016-04-10 17:13:19 -07:00
Cheridan a1eb2d459b Merge pull request #16729 from RemieRichards/holomap_port 
Station blueprints improvements
 2016-04-10 13:40:34 -05:00
RandomMarine af01ed7e00 Golem ship tweaks and additions 2016-04-09 21:19:38 -07:00
Cheridan 4f108b6913 Merge pull request #16745 from coiax/muh-ore-box 
Ore box changes
 2016-04-09 15:43:02 -05:00
Nerd Lord 84ae3dd731 ... 2016-04-09 12:33:32 -04:00
Jack Edge 870208e7e4 Made ore boxes cost 4 wood instead of 20 2016-04-09 15:53:38 +01:00
TrustyGun 022d9e573f okay mr.phil man 2016-04-09 10:43:35 -04:00
Jack Edge 07aafedcac Added making ore boxes out of 20 wood planks 
Did you know ore boxes were made of wood? It's in the description
for them and everything.
 2016-04-08 15:45:03 +01:00
TrustyGun 927e08d271 Flasks! 2016-04-08 06:26:30 -04:00
Remie Richards 9d80fb06a7 fixes a potential minor issue with swapping the blueprint's user 2016-04-08 06:42:29 +01:00
Remie Richards 95d2f9a848 Ports the functionality of the /vg/ holomap to the Station Blueprints, you can now see a layout of cables/pipes/atmos/power machinery as it was at roundstart to assist in repairs 2016-04-08 01:02:41 +01:00
Nerd Lord 13bb58dbc0 orange prisoner ids now show up in wallets 2016-04-07 19:27:17 -04:00
Cheridan 2420e43d1d Merge pull request #16671 from bgobandit/copydocs 
Secret documents can now be copied.
 2016-04-07 13:00:57 -05:00
Nerd Lord b8026883ee Adds the Medical Wrench 2016-04-06 12:56:38 -04:00
bgobandit 35cf1071cd honk 2016-04-05 22:14:05 -04:00
bgobandit 94fe7ef642 Secret documents can now be copied. 2016-04-05 19:00:21 -04:00
Cheridan b1a20326ec Merge pull request #16616 from bgobandit/clownmegaphone 
Gives the clown a megaphone.
 2016-04-05 15:35:36 -05:00
AnturK abe689cac9 Merge pull request #16587 from xxalpha/cigbrand 
Cigarette packs will brand their cigarettes.
 2016-04-05 19:59:09 +02:00
Cheridan 90cb067020 Merge pull request #16621 from duncathan/atmosspawnair 
Makes atmos_spawn_air() use the new gas string parser
 2016-04-05 11:38:12 -05:00
Cheridan 663cabf337 Merge pull request #16625 from KorPhaeron/building 
Fixes blueprints not working on lavaland
 2016-04-05 10:38:24 -05:00
KorPhaeron a6cd496c95 Merge pull request #16521 from erwgd/StorageEnhance 
Exosuit and utility belt enhancements, holster description change
 2016-04-04 20:57:03 -05:00
Cheridan b271395b06 Merge pull request #16573 from bgobandit/carrotrobustness 
Minor knife changes.
 2016-04-04 17:47:09 -05:00
KorPhaeron 01daa04d69 Outdoors check 2016-04-04 04:15:04 -05:00
KorPhaeron 0e52777d19 Fixes blueprints on lavaland 2016-04-04 04:14:36 -05:00
duncathan 497a4efc70 makes atmos_spawn_air() use the new gas string parser 2016-04-04 01:49:09 -06:00
Cheridan cf4ffc2781 Merge pull request #16026 from duncathan/turfs 
[REVIEW-READY] removes simulated turfs (and asteroid station)
 2016-04-04 01:49:45 -05:00
bgobandit dc9c725e41 Adds the clown megaphone. Standardizes megaphone font. Fixes typo. Adds self to admins.txt. 2016-04-04 02:13:33 -04:00
KorPhaeron 4a43bdbfda Merge pull request #16589 from psykzz/patch-1 
Suicide messages
 2016-04-03 22:01:30 -05: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
bgobandit 73bb67a1ea typo 2016-04-03 07:02:59 -04:00
xxalpha d6301ff735 Cigarette packs will brand their cigarettes. 
an

the macros dont work
 2016-04-03 10:42:53 +01:00
bawhoppen af51a66e37 Adds sandbags 
* sandbgs an stuff

* mmmm

* fucking sandbags

* okokok

* aaaaaaaaaaaaaaaaaaaaaah
 2016-04-02 23:52:12 -04:00
Joan Lung c3f4f4f9f8 Nar-Sie will now convert girders to cult girders and metal sheets to runed metal sheets 
* Nar-Sie will now convert girders to cult girders and metal sheets to runed metal sheets

* qdel(qdel())
 2016-04-03 13:41:45 +10:00
Matt Smith 70040af586 Suicide messages 2016-04-03 01:51:46 +01:00
bgobandit 5e3727a85f Minor knife changes. 2016-04-02 03:40:26 -04:00
KorPhaeron efe5ec8dbc Merge pull request #16500 from erwgd/SpearIntoLathe 
Cable restraints and spears can be recycled in autolathe, but not zipties
 2016-04-01 20:47:16 -05:00
Joan Lung 82350431b2 Merge pull request #16439 from KorPhaeron/mecha2 
Mining Gear Balance
 2016-03-31 22:10:07 -04:00
duncathan salt 0f04ea79a0 Merge pull request #16401 from Tytynguyen/atmosrounding 
Atmospheric readings are now accurate to 0.01%
 2016-03-31 12:04:48 -06:00
erwgd 2c7fda0148 removed a redundant carried in shoulder holster desc 2016-03-31 13:07:47 +01:00
erwgd 5c90078c5b Lets you carry gloves in tool, sec, med and jani belts, bounced radios in tool, sec and med, edited shoulder holster description, let you carry handheld crew monitor in labcoats 2016-03-31 12:19:15 +01:00
KorPhaeron 03216dce2e Merge pull request #16465 from TehZombehz/foodbox 
Adds random ingredient food packages to chefs
 2016-03-31 04:03:09 -05:00