coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,493 Commits 9 Branches 11 Tags
2cbc3e45a3d0568e4657fef995c8d3eec4e7cf63
Commit Graph

4574 Commits

Author SHA1 Message Date
Razharas 2cbc3e45a3 Added trays 2014-03-02 07:19:41 +04:00
Razharas f355feb129 Merge branch 'master' of https://github.com/tgstation/-tg-station into PartBag 2014-03-02 04:59:35 +04:00
Razharas 57b4f896d4 Making compilable 2014-03-02 04:40:05 +04:00
Razharas bb6009c9b7 Merge conflicts a bitch 2014-03-02 04:34:56 +04:00
Razharas 08064142e6 Merge branch 'master' of https://github.com/tgstation/-tg-station into LingSting 2014-03-02 04:29:26 +04:00
Razharas 2fd5557682 Conflict fix 2014-03-02 04:14:32 +04:00
Aranclanos a671ea8c8b removes my fucks ups, Chemistry-Recipes.dm is standardized now (again) and the weedkiller and pestkiller chemical reactions are added back. 2014-03-01 18:15:12 -03:00
Aranclanos cbffed689d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeReactions 
Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm
 2014-03-01 16:22:01 -03:00
Hornygranny 056932aa58 corrects unbuckle feedback message 2014-02-27 21:59:43 -08:00
hornygranny e65dc20971 Electrodes, stun bullets, darts and bolts reduced from 10 to 5 2014-02-27 13:04:58 -08:00
hornygranny c31647376e This is for discussion of things that need to be changed to move away from purely stun based combat. Please only comment if you have something to contribute, rather than just saying you like or dislike it. 
Shoes do not increase your movement speed
Stun/weaken on basically everything reduced from 10+ to 5 ticks
Time to unbuckle/uncuff self halved
 2014-02-27 10:56:06 -08:00
Miauw 5c55636bc0 Revert "Removes radio from pAI" 
This reverts commit 0dc364a6b1.
 2014-02-26 14:50:18 +01:00
Aranclanos 6695c0c13b Merge pull request #2850 from MrPerson/revenge_of_kitty_ears 
Return of kitty ears
 2014-02-26 07:40:39 -02:00
Cheridan 98b39580cd haha oops thanks travis 2014-02-25 23:25:30 -06:00
Cheridan b84c7c3b1d Merge branch 'master' of https://github.com/Kelenius/-tg-station into Kelenius-master 
Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm
	code/game/machinery/vending.dm
	code/modules/hydroponics/hydroponics.dm
 2014-02-25 23:11:56 -06:00
Cheridan 21013863b9 Fixes conflicts 2014-02-25 19:49:24 -06:00
Cheridan 5ec24c8613 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChuckTheSheep-Botany-Big-Booty-Twerk 
Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm
	code/modules/reagents/Chemistry-Reagents.dm

resolved with Theirs, must manually reapply fixes
 2014-02-25 19:39:26 -06:00
Jittai 1a832cfb55 Boop 2014-02-25 19:26:20 -05:00
Rockdtben 9a2426a219 Merge pull request #2903 from hornygranny/harmyeller 
Removes pAI radio
 2014-02-25 17:19:11 -06:00
Razharas 56f94f59da Merge branch 'master' of https://github.com/tgstation/-tg-station into PartBag 2014-02-25 05:05:22 +04:00
Razharas 340846fb4d Quick fix 2014-02-25 05:05:12 +04:00
AlexanderUlanH 7de04b6c3c Merge branch 'master' into spaceareas 2014-02-24 17:47:19 -05:00
Cheridan 6f7b75f38c Merge pull request #2895 from Incoming5643/prettypatties 
[map] Pretty Patties
 2014-02-24 15:51:45 -06:00
Kelenius af75d13216 Conflicts: 
code/modules/hydroponics/hydroponics.dm
Fixed, hopefully
 2014-02-25 01:26:05 +04:00
Cheridan ff08e7c557 Merge pull request #2893 from Miauw62/gurehibjkogtirfhdgyf(ihgufhygdfrgjihkigfjuhygdfhijgufhygdhufrg 
Fixed more NODROP runtimes
 2014-02-24 13:43:33 -06:00
hornygranny 0dc364a6b1 Removes radio from pAI 2014-02-24 10:44:26 -08:00
Razharas ba54bd940b Conflict fix 2014-02-24 22:12:02 +04:00
Aranclanos 217132efa6 Merge pull request #2877 from Incoming5643/boltbgone 
Bolt of animation fix
 2014-02-24 15:03:06 -02:00
Aranclanos b64ba5ba1e Merge pull request #2887 from Giacom/statue_fixes 
Silicons no longer stop statues from being able to move.
 2014-02-24 14:59:00 -02:00
Razharas 0a8e8a6b3e Merge pull request #2843 from MrPerson/its_a_beeeeeeeeeeeeaaaaaaaarrrr!!!!! 
Standardized space bears.
 2014-02-24 08:07:48 -08:00
Aranclanos 90fe98402c Merge pull request #2890 from Razharas/TeleSci 
Telescience fix
 2014-02-24 14:04:59 -02:00
Razharas 94907b1311 Merge pull request #2839 from Aranclanos/BloodReagent 
Blood runtimes fix.
 2014-02-24 07:56:39 -08:00
Razharas d8f12f0680 Merge pull request #2836 from Cheridan/hydro 
Drying Rack as smartfridge
 2014-02-24 07:56:17 -08:00
Razharas 3d90e8815e Merge pull request #2827 from Ergovisavi/muh_vision 
Adding NVG's/Advanced Mesons to the protolathe, some human vision changes
 2014-02-24 07:55:34 -08:00
Razharas 00512ba146 Merge pull request #2805 from rymd/somatoray 
Floral somatoray requires radium instead of uranium
 2014-02-24 07:54:39 -08:00
Razharas 0aaf809c70 Proper chem handling for protolathe and imprinter 
Also imprinter is now according to basic code standarts
 2014-02-24 19:19:03 +04:00
Razharas b27d9c7396 Added RPED, some sprites and new power cell path 
Your dreams of big part storage and fast machine part exchange came true
14 slot R&D part-only autoseeker/picker/dropper/exchager is in
Added different sprites for better capacitors and scanning modules
Changed the power cell type to be compatible with all this machine
changing faggotry
All sprites here are codersprites so ask nien/WJ for better ones if you
want
 2014-02-24 05:14:43 +04:00
Incoming 58f871ca25 By sticking a crayon in the mix when making a burger you can now make a colored burger! 
Standardizes burger code to end the madness of there being like 30 different burgers that have the same damn thing in them.
 2014-02-23 18:34:32 -05:00
Miauw f75692ceed Fixed more NODROP runtimes 2014-02-23 19:34:49 +01:00
Miauw 2a7f688d90 Fixes a NODROP runtime. 2014-02-23 19:20:27 +01:00
Aranclanos e6c856e456 Merge pull request #2803 from Rockdtben/SyndCardDesc 
Synd card desc
 2014-02-23 13:46:10 -02:00
Razharas 84e1d9872e Telescience fix 
Fixes infinite telecrystals from telescience
I tested most of the computers and they were good
No idea who put initialize into new and why
 2014-02-23 16:54:52 +04:00
Cheridan e306f40647 Merge pull request #2870 from Aranclanos/ReagentCodeSpawn 
Removed some spawn(0) calls from the reagent code, fixes runtimes.
 2014-02-22 23:39:35 -06:00
Cheridan c91a3a1ed5 Merge pull request #2856 from Giacom/wiki_manuals 
[MAP] Added a new wiki manual subtype which will allow you to easily add new book/manuals which link to the wiki.
 2014-02-22 23:28:04 -06:00
Giacomand 916e7c9ec3 Silicons no longer stop statues from being able to move. 
Added a variable that will allow you to have the statues move while seen.
 2014-02-22 22:22:02 +00:00
Cheridan b723f68979 Merge pull request #2868 from Aranclanos/StopThinkingBrain 
Stops brains generating runtimes by toggling throw mode
 2014-02-22 12:58:36 -06:00
Aranclanos db8f4b66f5 Merge pull request #2874 from Razharas/RuntimesFix 
DNA and R&D console runtimes fix
 2014-02-22 11:52:07 -02:00
Rockdtben e591d8099e Merge pull request #2859 from hornygranny/gibtonitelog 
Fixes #2783
 2014-02-21 20:42:49 -06:00
Rockdtben 8af22aeeac Merge pull request #2861 from hornygranny/muhspans 
Fixes #2726, #2729
 2014-02-21 20:39:58 -06:00
Incoming 69ff4041c1 bolts of animation weren't deleting when creating statues at point blank range. 2014-02-21 20:58:38 -05:00