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

8427 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 1eebd507ed Added better sprites 2014-03-02 04:59:14 +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
Aranclanos 1aff9034d9 Merge pull request #2943 from Aranclanos/ServerCrash 
Server crash fix.
 2014-02-28 19:42:27 -02:00
Aranclanos b565b2125e Server crash fix. 2014-02-28 13:20:15 -03:00
Hornygranny 056932aa58 corrects unbuckle feedback message 2014-02-27 21:59:43 -08:00
Hornygranny 112b14e5d1 corrected typo 2014-02-27 21:27:20 -08:00
hornygranny e65dc20971 Electrodes, stun bullets, darts and bolts reduced from 10 to 5 2014-02-27 13:04:58 -08:00
hornygranny 84a6aeae05 Some mecha slightly slower 2014-02-27 11:58:25 -08:00
hornygranny ac8763227b Slightly sped up cuffing to compensate 2014-02-27 11:07:43 -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
Cheridan 6f4bea2b0e Merge pull request #2921 from Miauw62/icantthinkofabranchname 
Revert "Removes radio from pAI"
 2014-02-27 12:00:43 -06:00
Razharas 73bace127e Merge pull request #2925 from TZK13/Firefighting-Crate 
Firefighting crates
 2014-02-27 08:47:48 -08:00
TZK13 16f407983c Adds an emergency supply crate containing two sets of the contents within fire safety closets for 10 supply points. 2014-02-26 12:55:40 -06:00
Cheridan 0061c1f6f3 Merge pull request #2910 from Jordie0608/whatgiacomactuallylookslike 
Fixes #2864
 2014-02-26 10:15:20 -06: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 f06b55ba25 Merge pull request #2919 from Cheridan/master 
Conflict fix of #2842 Hydro Tray Upgrades
 2014-02-25 23:30:13 -06: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 011a78f478 Merge pull request #2902 from Miauw62/actualbranchnamesyounerd 
Fixes NODROP not playing nice with tables.
 2014-02-25 22:37:09 -06:00
Cheridan 004b005ab2 Merge pull request #2901 from Miauw62/aijgdiajgiojdaigjapgijsgdipjagiojaranisafagaidpjgiaopjgdoiadjgaipgjpijadgijagipjadijigpaijgdipajgdipajdgpiadjgpajgd 
Fixed #2899 (NODROP and closets doing weird shit)
stop making retarded branch names miauw
 2014-02-25 22:29:39 -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
Jordie0608 d3e80fa58c Fixed entertainment monitor's incorrect icon path and missing sprite. 2014-02-26 00:48:59 +11:00
Aranclanos 0110a571d7 Merge pull request #2884 from Incoming5643/Clockwork 
fixes #2881
 2014-02-25 09:40:01 -02:00
Razharas fdf5a2bb12 Fixes autolathe 2014-02-25 08:22:24 +04:00
Razharas 0fc9f380f4 Included autolathe 2014-02-25 05:09:28 +04: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 ded7b01f5f Merge pull request #2829 from Razharas/LifeLikeTexture 
Autolathe improvements
 2014-02-24 16:27:16 -06:00
Incoming 2ba44444f8 Swaps the fix for the one suggested 2014-02-24 17:18:26 -05:00
Cheridan 0484924e95 Merge pull request #2882 from Miauw62/diojagijasdgjisagopagpjsagpoagpjga 
Fixed #2880 horse mask removable
 2014-02-24 15:57:39 -06: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
Miauw 41a9321d2a rip in peace more parems 2014-02-24 19:43:09 +01:00
Miauw 27d0b64032 Fixes NODROP not playing nice with tables. 
(thx for submitting bug reports guise)
 2014-02-24 19:38:10 +01:00
Miauw 8ed2cdb07a Fixed #2899 2014-02-24 19:25:57 +01:00
Razharas ba54bd940b Conflict fix 2014-02-24 22:12:02 +04:00