coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
31,741 Commits 9 Branches 11 Tags
80688df26cd83cc3397adef13b3fa00a02c8a2b1
Commit Graph

25341 Commits

Author SHA1 Message Date
Supermichael777 80688df26c and adds the actual delay 2016-03-25 15:00:35 -04:00
Supermichael777 c141cc59a2 updates pills to alow for a delay because inheritance 2016-03-25 14:58:35 -04:00
Razharas ec46771fc5 Merge pull request #15921 from Iamgoofball/goon_port 
Goon Port #1: Stock Market
 2016-03-23 04:42:22 +03:00
AndrewJacksonThe2nd 156b7487b0 sdasdfadqadqd 2016-03-22 18:28:57 -07:00
AndrewJacksonThe2nd 57b2faf988 wake me up 2016-03-22 18:25:02 -07:00
AndrewJacksonThe2nd 88b0f8a87b aaaaaaaaaaaaaaaaaaaa 2016-03-22 17:37:33 -07:00
KorPhaeron 6df3dd47d6 Merge pull request #16266 from Lumipharon/botany5001 
Makes some plants a bit better
 2016-03-22 19:24:59 -05:00
KorPhaeron 5467920163 Merge pull request #16274 from ChangelingRain/alienweed 
Removes weed edging code
 2016-03-22 19:14:32 -05:00
AndrewJacksonThe2nd d70279e203 Merge branch 'master' of https://github.com/tgstation/-tg-station into goon_port 2016-03-22 16:13:17 -07:00
AndrewJacksonThe2nd 09c3bb3be1 stock market 2016-03-22 16:09:36 -07:00
Joan Lung b5ad742637 Merge pull request #16276 from tgstation/duncathan-patch-1 
Fixes 509 support
 2016-03-22 18:45:55 -04:00
AnturK b6b8a3eb09 Merge pull request #16260 from Bawhoppen/grenadesholyshithelp 
Grenade belt for nukeops
 2016-03-22 19:35:43 +01:00
AnturK 6a00718ed0 Merge pull request #16252 from erwgd/PmanJsuitExtgshFix 
Plasmaman jumpsuit now only extinguishes wearer if they are on fire
 2016-03-22 19:27:58 +01:00
AnturK 0252a01115 Merge pull request #16181 from Jordie0608/goodcodingpracticesarelikeusefulcommentsthisfilehasneither 
Cleanup of polling code
 2016-03-22 19:25:56 +01:00
AnturK 2a327b1b7b Merge pull request #16188 from Robustin/zap 
Singularity beacon now attracts the Tesla Ball
 2016-03-22 19:18:45 +01:00
KorPhaeron c5746e84ae Merge pull request #16267 from CPTANT/Staminafixnew 
fixes #15316 - Stamina resistance being applied twice
 2016-03-22 13:03:14 -05:00
Joan Lung 9164bbdb20 Merge pull request #16263 from KorPhaeron/mine_turfs 
Cleans up mining turf code
 2016-03-22 13:30:16 -04:00
duncathan salt b359725bfc Fixes 509 support 2016-03-21 21:56:00 -06:00
Nerd Lord eabdb0966d actually fuck it I'll randomize them myself 2016-03-21 21:43:30 -04:00
Nerd Lord 9b9f822b87 kills weed edging code with a hatchet 
invites wj to kill me because the weed icons aren't random anymore and you'd need like three DMIs to achieve randomness
 2016-03-21 21:11:03 -04:00
Cheridan 35e62a7feb Merge pull request #16255 from Iamgoofball/patch-6 
fixes beam() lag
 2016-03-21 19:21:16 -05:00
KorPhaeron 9862f9b8d4 Layers 2016-03-21 17:08:14 -05:00
Nerd Lord 4865ca6a7e a donk 2016-03-21 18:08:05 -04:00
Nerd Lord f062e54887 too close must conflict 2016-03-21 17:30:39 -04:00
KorPhaeron cfe7af21e7 Mine turf cleanup 2016-03-21 15:55:31 -05:00
Cheridan 6b65866444 Merge pull request #16210 from ChangelingRain/lightningmaster 
Adds Lightning Holoparasites
 2016-03-21 15:34:59 -05:00
Cheridan 7627e1c0e2 Merge pull request #15859 from Core0verload/wall_flash 
Wall mounted flashes are now buildable
 2016-03-21 12:32:55 -05:00
Robustin f8a59bb002 Update uplink_item.dm 2016-03-21 10:52:26 -04:00
CPTANT fbbd5b0259 fixes stamina resistance 2016-03-21 14:49:47 +01:00
Lumipharon acb3941312 Improved various plants and added extra chemicals to others - Being a botanist should now be more FUN. 2016-03-22 00:07:11 +13:00
Cheridan a29aba94e9 Merge pull request #16206 from JJRcop/JJRcop-patch-1-1 
buffs milk for skeletons and plasmamen (not stolen)
 2016-03-21 03:59:54 -05:00
Kyle Spier-Swenson 97d378dc90 properly ports json for 509 support 
@neersighted, why mang why?
 2016-03-21 01:41:22 -07:00
Cheridan 110c027792 Merge pull request #16245 from MrStonedOne/patch-172 
Fixes ssair trying to proc unsimulated turfs.
 2016-03-21 03:22:02 -05:00
KorPhaeron b52e8cb847 Merge pull request #16213 from AnturK/buildmode_fix 
Fixes buildmode dir
 2016-03-21 03:16:31 -05:00
Cheridan 4227b97faa Merge pull request #15667 from kingofkosmos/storagescloseonclick 
Removes backpack close-button
 2016-03-21 03:10:26 -05:00
KorPhaeron c95e64c17e Makes mine turfs less garbage 2016-03-21 03:00:51 -05:00
Cheridan 0fafccf9ef Merge pull request #16178 from KazeEspada/GPStendrils 
Necropolis Tendrils emit an eerie signal.
 2016-03-21 02:53:15 -05:00
Cheridan bb97cb8a2a Merge pull request #16237 from PKPenguin321/patch-9 
tweaks some evil fucking punctuation
 2016-03-21 02:16:49 -05:00
Jordie0608 5f4b341a4b fixes and user notification 2016-03-21 16:32:27 +11:00
Jordie d31bc85106 Merge pull request #16082 from Core0verload/plants-revengeofGMO 
Adds a test version of bioengineering
 2016-03-21 15:57:40 +11:00
bawhoppen 07ca0c9515 compromising is hard 2016-03-20 20:57:50 -05:00
bawhoppen d410b37e2d more comrpomise 2016-03-20 20:12:36 -05:00
bawhoppen f71de178c0 compromised 2016-03-20 20:10:22 -05:00
Lularian 83624574e5 tkdrg said to name commits something useful 2016-03-20 19:50:22 -05:00
Cheridan dae163e814 Merge pull request #16226 from KorPhaeron/tentacle2 
Anchors goliath tentacles
 2016-03-20 19:25:33 -05:00
Cheridan 4147be16fa Merge pull request #16215 from phil235/BodybagClosingFix 
Fixes bodybag making the wrong sound when closed
 2016-03-20 19:24:33 -05:00
Iamgoofball 57bae68689 fixes beam() lag 2016-03-20 16:07:48 -07:00
Joan Lung d7f81ba433 Merge pull request #16190 from KorPhaeron/tastetherainbow 
Mineral Golems
 2016-03-20 18:38:00 -04:00
erwgd 47c9660b03 plasmaman jumpsuit extinguishes wearer only if they are on fire 2016-03-20 18:01:33 +00:00
Cheridan c533a17259 Merge pull request #16216 from phil235/CanisterBreakFix 
Canister breaking open now properly disconnects from possible connect…
 2016-03-20 11:47:50 -05:00