coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
18,764 Commits 9 Branches 11 Tags
643de0c922473f9ee721be207a024676121294de
Commit Graph

72 Commits

Author SHA1 Message Date
Cheridan bbbf666c9a Merge pull request #8051 from xxalpha/surgeon_ops 
Adds surgery table and tools to the Nuke Ops ship.
 2015-03-01 19:53:19 -06:00
xxalpha bdbbf2af62 Fix honk tiles in Nuke Ops base. 2015-03-01 00:34:12 +00:00
xxalpha 8fdccc2ff2 Adds surgery table and tools to the Syndicate Mothership medbay. 2015-02-27 23:56:30 +00:00
Steelpoint 622b49e1c5 AddedRoughedUpTilesToSolarArrays 2015-02-22 23:27:54 +08:00
Steelpoint b826f1a5eb RemoveShuttle 2015-02-22 23:14:50 +08:00
Steelpoint 8caabe4d9a Saved 2015-02-18 12:48:28 +08:00
Steelpoint dd27e73da7 NewAreas 2015-02-16 18:40:43 +08:00
Steelpoint 975066e9c9 MoreBroken 2015-02-14 22:40:23 +08:00
Steelpoint c134f0df8a BlownUpGravGen 2015-02-14 22:26:50 +08:00
Steelpoint 7c691cd1ce DerelictUpdate 2015-02-14 21:58:50 +08:00
Cheridan 585298ef33 Merge pull request #7557 from paprka/minormeds 
Gave miners a brute patch at roundstart and some more appropriate medkits
 2015-02-12 11:47:27 -06:00
Cheridan 216630f1db Merge pull request #7572 from phil235/CookingOverhaul 
Cooking overhaul
 2015-02-12 08:01:17 -06:00
Cheridan 961234003a Merge pull request #7648 from Menshin/asteroid_pipes_fix 
Removed strangely unnoticed pipes in asteroid.
 2015-02-11 20:55:07 -06:00
phil235 549b71a487 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul 
Conflicts:
	icons/obj/drinks.dmi

Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
 2015-02-11 16:13:04 +01:00
Menshin 3587be0c17 Removed strangely unnoticed pipes in asteroid. 2015-02-10 19:43:52 +01:00
phil235 35fb458293 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul 
Conflicts:
	code/modules/food&drinks/food/snacks_other.dm
	icons/obj/drinks.dmi
 2015-02-07 20:22:49 +01:00
paprka d27b6f25b6 fixes ion rifle and floating armory 2015-02-07 09:35:18 -08:00
phil235 63456ef622 Many fixes. Adding custom pizza slices. Reducing amount of icons used. Adding a changelog. 2015-02-07 03:10:32 +01:00
TheVekter 9bc2137815 man fuck typos 
Whoops, might wanna update on my end before changing a path.

Fixed typo 'Tequilla'.
 2015-02-05 15:43:09 -06:00
paprka 40d43dad46 gave miners a brute patch and some medkits 2015-02-04 14:29:32 -08:00
paprka 6de33d4063 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff 
Conflicts:
	_maps/map_files/generic/z2.dmm
 2015-02-02 19:13:49 -08:00
JJRcop 400cc02d3e Fixes Z2 mispathing 2015-02-02 19:06:38 -05:00
Swag McYolosteinen 9bddcb3df4 Merge pull request #7492 from xxalpha/spacesuit_storage 
Repath all non jetpack tank types to tank/internals
 2015-02-02 18:52:51 +01:00
paprka 18a90495b2 updates to ERT stuff 2015-02-02 03:33:37 -08:00
paprka bb75737695 two of everything for ert gear 2015-02-01 22:22:08 -08:00
paprka a5dcd1abd8 improves ert spawning and centcomm 2015-02-01 21:16:11 -08:00
Cheridan f8bb02d54a Merge pull request #7422 from Steelpoint/ERTBalance2 
ERT Balance Pass 2 | ERT Access and Foam
 2015-02-01 20:16:04 -06:00
xxalpha a9c181bbcc Repath all non jetpack tank types to tank/internals 
Repath all portable tanks to tank/internals, except jetpacks

Update ministation
 2015-02-01 18:25:39 +00:00
Menshin aa83cbc35a Added a generic pin to the ion rifle in the Syndicate Mothership. 2015-01-30 00:19:00 +01:00
Menshin e5ed7c8014 Added proper area_type var to the Syndicate Mothership docking port (fixes #7326) 2015-01-29 23:49:43 +01:00
Menshin 3716d9b0bc Mapmerge pass 2015-01-29 23:34:03 +01:00
Menshin 6c03fcf5e8 Added a "interior" subtype for shuttle wall that doesn't add an overlay of the destination turf on shuttle move 2015-01-29 20:41:22 +01:00
Steelpoint 18fe642fcc ERTBalanceV2 2015-01-29 19:03:07 +08:00
paprka 9c21cf5d42 fixes and such 2015-01-27 17:16:42 -08:00
Steelpoint be5ce10a33 MissingDoor 2015-01-27 13:12:32 +08:00
Steelpoint 47e0a4fa02 WhiteShip2 2015-01-24 20:27:06 +08:00
Steelpoint e63c805494 FixMissingIonGunFiringPin+LoyaltyPinsForPulseGuns 2015-01-22 16:47:01 +08:00
Steelpoint 35ef9aa505 MergeConflict 2015-01-22 03:28:43 +08:00
Steelpoint ad04ce62a0 AllAccess+EasierSuitIdentification 2015-01-20 20:53:13 +08:00
Steelpoint a097f86ac6 ERTBalancePassV1 2015-01-18 19:18:47 +08:00
Iamgoofball fec3b3e9dd Changes, adjustments, NEW CHEMICAL: Epinephrine 2015-01-16 17:56:55 -08:00
Cheridan 63e09d0928 Merge pull request #6966 from Steelpoint/ERTv2 
[FEATURE] Emergency Response Team V2
 2015-01-15 23:41:20 -06:00
tkdrg aa20d46af5 Merge pull request #6677 from MrPerson/feature_removal_3 
Removes Uhangi's shoes
 2015-01-15 13:35:51 -03:00
Steelpoint 987f6cb900 MergeCon 2015-01-13 12:56:28 +08:00
carnie 22423d2463 Resolves #6953 - Shuttle transparent corners now inherit a snapshot of the turf they replace. Note: don't use them for interiors! Only external corners!. 2015-01-11 18:42:58 +00:00
Steelpoint 982c54c2f3 EmergencyResponseTeamV2 2015-01-11 19:21:38 +08:00
tkdrg b0635993a4 Revert "[FEATURE] Emergency Response Team" 2015-01-10 19:55:30 -03:00
Swag McYolosteinen 404cd883f7 Merge pull request #6705 from Steelpoint/EmergencyResponseTeam 
[FEATURE] Emergency Response Team
 2015-01-10 10:10:59 +01:00
carnie 4b3248448a Resolves #6899 - misplaced docking port 2015-01-09 01:25:32 +00:00
Steelpoint d7b56c9d7e Nanites! 2015-01-08 20:13:06 +08:00