coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
17,992 Commits 9 Branches 11 Tags
52bac4048554fa5b809ef45b10db95eeee3fc16d
Commit Graph

7947 Commits

Author SHA1 Message Date
paprka 52bac40485 nerfs mining drill a little 2015-02-13 22:04:38 -08:00
paprka 85675e92b8 my good judgement gets the better of me 2015-02-13 21:50:00 -08:00
paprka ab3ff729ce some fixes 2015-02-13 21:44:04 -08:00
paprka 88760896ad initial commit 2015-02-13 20:59:39 -08:00
WJohn cf395f7da8 Merge pull request #7643 from TZK13/Plaid-Skirts 
Adds plaid skirts and new schoolgirl uniform colours
 2015-02-13 01:47:57 -05:00
Cheridan 0d211471b8 Merge pull request #7662 from Menshin/admin_blood_healing 
Fixes admin healing not giving blood back.
 2015-02-12 16:13:22 -06:00
Cheridan 216630f1db Merge pull request #7572 from phil235/CookingOverhaul 
Cooking overhaul
 2015-02-12 08:01:17 -06:00
Cheridan 566fd07593 Merge pull request #7651 from paprka/tacticalfleshlight 
makes flashlight attaching more modular
 2015-02-12 07:55:26 -06:00
phil235 25b2cb0296 Merge pull request #7672 from MrStonedOne/revert-7592-patch-8 
Revert #7592 for breaking ai objection interaction. fixes #7671 - ai can not interact with most topic based interfaces
 2015-02-12 12:26:44 +01:00
Remie Richards 6613851028 Merge pull request #7593 from Cheridan/pin_fix 
Pin fixes, additions
 2015-02-12 06:43:11 +00:00
MrStonedOne 84ec44d5c4 Revert "remove some duplicate code" 2015-02-11 20:47:41 -08:00
Cheridan 9e8029e64d Merge pull request #7645 from TZK13/Purple-Plasma 
Makes liquid plasma purple
 2015-02-11 21:03:53 -06:00
hornygranny 6e2fe375f7 Merge pull request #7650 from dannno/slurring 
PROPER SLURRING
 2015-02-11 17:40:32 -08:00
dannno 012837a4f5 appease my own 'tism 
even numbers are nice
 2015-02-11 20:03:54 -05:00
dannno 7d4fb341df no more alternating letters in slurring 2015-02-11 20:01:23 -05:00
hornygranny 8f1603b3e4 Merge pull request #7658 from Menshin/viruses_fix 
Viruses related fixes
 2015-02-11 12:25:57 -08:00
Menshin 295fdf0e85 Fixes admin healing not giving blood back. 2015-02-11 20:39:16 +01:00
Menshin 4be0d7940a * Fixes exponentially growing number of diseases on iv_drip giving contaminated blood 
* Reagents now reacts when given by iv_drip()
* Viruses now correctly transfer on blood transfusion
* Some code cleaning
 2015-02-11 18:16:17 +01:00
Cheridan 0db4c09326 Merge pull request #7573 from xxalpha/schizo 
Hear the voice of the chosen deity in your head.
 2015-02-11 09:52:05 -06:00
Cheridan 7c360499be Merge pull request #7644 from TZK13/Novaflowers-and-Watermelons 
Novaflower and watermelon improvements
 2015-02-11 09:14:16 -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
Cheridan ee75ba2acd Merge pull request #7639 from GunHog/RollyPollyBorgies 
Adds movement states for some cyborgs + overlay for miner jetpack
 2015-02-11 09:02:09 -06:00
Cheridan 65e8a4ce31 Merge pull request #7624 from paprka/defibfuckupv2 
Defib changes
 2015-02-11 08:37:28 -06:00
Cheridan 8ec97cdaa1 Merge pull request #7632 from GunHog/ExperimentorChanges 
E.X.P.E.R.I-MENTOR changes
 2015-02-11 08:18:57 -06:00
TZK13 8ae7a739dd Lowered maximum amount of possible fire stacks even more. 2015-02-11 06:51:23 -06:00
TZK13 2e919da8ab Lowered maximum amount of possible fire stacks. 2015-02-11 06:23:44 -06:00
paprka eabbd88858 makes flashlight attaching more modular 2015-02-10 14:17:57 -08:00
TheVekter 3861126c2c Reverts drunkenness changes per #7439 
Fixes a typo
Makes players drink full shot no matter how much is in glass
 2015-02-10 15:54:15 -06:00
dannno 54f1d333d7 Adds a slurring filter, replaces stutter filter where appropriate 2015-02-10 16:39:17 -05:00
TheVekter 5cc6371217 Merge branch 'master' of https://github.com/tgstation/-tg-station into shotglasseshowdotheywork 2015-02-10 12:06:04 -06:00
TheVekter 2b346676c1 Moved shotglasses back to drinkingglass.dm. Again. 
Added a bunch more iconstates for each drink in the booze-o-mat. Any drink the shot doesn't recognize comes up as a "shot of... what?"
 2015-02-10 11:50:28 -06:00
Swag McYolosteinen e971a1af29 Merge pull request #7592 from psykzz/patch-8 
remove some duplicate code
 2015-02-10 18:04:43 +01:00
Swag McYolosteinen 748341131c Merge pull request #7588 from Deantwo/ChemicalAnalyzing 
Analyze Upgrade
 2015-02-10 18:03:37 +01:00
Swag McYolosteinen 811a65f932 Merge pull request #7566 from Delimusca/chemheating 
reagent temperature enhancements
 2015-02-10 18:02:37 +01:00
Swag McYolosteinen cfacd3bf9f Merge pull request #7589 from Menshin/reagents_warnings_fix 
Fixes warnings related to add_reagent
 2015-02-10 17:55:32 +01:00
Swag McYolosteinen a62cbb77e5 Merge pull request #7501 from Iamgoofball/patch-28 
makes epipens more powerful at stopping losebreath
 2015-02-10 17:50:47 +01:00
Swag McYolosteinen f130872f4e Merge pull request #7517 from RemieRichards/MovableUIElements 
Movable UI Elements!
 2015-02-10 17:50:33 +01:00
Swag McYolosteinen bc64407000 Merge pull request #7582 from GunHog/FreePointsForHumanMiners 
Lets Silicons and Drones use the Ore Redemption Machine
 2015-02-10 17:46:03 +01:00
Swag McYolosteinen f48f254513 Merge pull request #7611 from Incoming5643/youjelly 
Exotic Blood
 2015-02-10 17:43:44 +01:00
Swag McYolosteinen 7882b3898b Merge pull request #7631 from phil235/SinguloInvestigateLogFix 
Fix singularity investigate log
 2015-02-10 17:41:06 +01:00
Swag McYolosteinen e5e8b27790 Merge pull request #7491 from paprka/simplyepicbuff 
Removes range from ebow bolts + price revert + bugfix
 2015-02-10 17:15:44 +01:00
TZK13 80ce37a611 Makes liquid plasma purple. 2015-02-10 07:24:18 -06:00
TZK13 d78322bb42 Adds new schoolgirl uniform colours and adds ties and black skirt to clothesmate. 2015-02-10 06:47:13 -06:00
TZK13 edf3364765 Novaflowers now ignite people with the amount of fire stacks applied depending on potency and you can now juice whole watermelons. 2015-02-10 06:26:03 -06:00
TZK13 b3f164e131 Ports plaid skirts from Baystation12. 2015-02-10 06:10:26 -06:00
TheVekter f26ceabf3a Made Toxins Special and B-52 exclusive to shot glasses. 
Tweaked drunkenness to make it less effective at lower booze levels, but moreso at higher.
Changelog.
 2015-02-10 02:21:50 -06:00
GunHog 8465c965c0 Adds movement states for some cyborgs 
Mining and Mediborgs get new movement states.
Janiborg scubbers will only move when the borg does.
Made mining borg jetpack an overlay.
 2015-02-10 00:44:38 -06:00
TheVekter 24ed9dd3e0 Wow apparently I broke the tequila sprite 2015-02-10 00:22:22 -06:00
TheVekter f49abb5117 Adds multiple drinks to the shotglass list so they can be mixed within. 
Re-adds bottle of booze that got removed in a merge conflict a while back.
 2015-02-09 18:25:03 -06:00
TheVekter ba18c0e925 Adds sprites and iconstates for shot glass. 2015-02-09 17:38:23 -06:00