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

3050 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 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
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
RandomMarine af01ed7e00 Golem ship tweaks and additions 2016-04-09 21:19:38 -07:00
Nerd Lord 84ae3dd731 ... 2016-04-09 12:33:32 -04:00
TrustyGun 022d9e573f okay mr.phil man 2016-04-09 10:43:35 -04:00
TrustyGun 927e08d271 Flasks! 2016-04-08 06:26:30 -04:00
Nerd Lord 13bb58dbc0 orange prisoner ids now show up in wallets 2016-04-07 19:27:17 -04:00
Nerd Lord b8026883ee Adds the Medical Wrench 2016-04-06 12:56:38 -04:00
AnturK abe689cac9 Merge pull request #16587 from xxalpha/cigbrand 
Cigarette packs will brand their cigarettes.
 2016-04-05 19:59:09 +02: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
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
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
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
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
TehZombehz 6fb6da13a7 One line change 2016-03-31 03:54:02 -05:00
TehZombehz 229a90ba10 Reorganized for standards 2016-03-31 02:53:52 -05:00
duncathan salt 3d95d68b2f Merge pull request #16279 from Core0verload/HUDfuckery 
Slot icons micro-refactor
 2016-03-30 23:30:06 -06:00
duncathan eeb0119acb Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/modules/mob/mob_movement.dm
	code/modules/recycling/conveyor2.dm
 2016-03-30 22:55:00 -06:00
TehZombehz 0f26065c64 HOPEFULLY removes conflicts 
First attempt ev
 2016-03-30 17:12:55 -05:00
erwgd 9f3694ba40 Changed materials of wired rod to account for cable restraints 2016-03-30 22:22:06 +01:00
erwgd d50cc41180 Gave cablecuffs and spear materials list, removed materials from zipties 2016-03-30 22:02:12 +01:00
KorPhaeron b388e76f9c Knives and thermal protection 2016-03-30 13:28:38 -05:00
duncathan salt 5ff2020202 Merge pull request #16357 from Iamgoofball/fast 
Foam and Conveyor Belts now process as fast as possible, Adds the Fast Process subsystem
 2016-03-29 20:06:55 -06:00
duncathan e86cf0f280 praise the good lord, for the game finally compiles 2016-03-29 19:04:37 -06:00
TehZombehz 2e5012e9d4 Typo 
VEGETARIAN
 2016-03-29 19:25:47 -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
Cheridan 0bb49b1a97 Merge pull request #16440 from TehZombehz/papersack 
Adds craftable paper sacks
 2016-03-29 11:27:41 -05:00
TehZombehz acd351bc15 Type replacement 2016-03-29 08:10:04 -05:00
TehZombehz da31e890ab Changes Kor requested #1 2016-03-29 01:06:37 -05:00
TehZombehz 326eaf17c6 Small compression 2016-03-28 23:26:23 -05:00
TehZombehz e13840ffde Adds random ingredient food packages to chefs 
Adds various ingredient boxes, a random one of which is chosen for the
chef to start with. Also adds soysauce bottles preset items.
 2016-03-28 22:58:03 -05:00
KorPhaeron 8c49ed7053 Merge pull request #16408 from Iamgoofball/patch-14 
DEFIB: Splits up "no heart" and "body too old" messages
 2016-03-28 12:23:35 -05:00
TehZombehz a6a338ae76 More typo fixing 
I swear I'm good at english
 2016-03-28 02:43:21 -05:00
TehZombehz c83cc45ab2 Regular and smiley paper sack are now wearable if modified 
Use a sharp object on an empty regular or smiley face paper sack to
craft their respective wearable paper sack hats.
 2016-03-28 01:59:44 -05:00
TehZombehz fe35d72828 Requirement to hold paper bag to change design removed 2016-03-28 00:01:50 -05:00