coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,610 Commits 9 Branches 11 Tags
9df2455cfbc5c871b608ea47eec9ed95fb60cd94
Commit Graph

4117 Commits

Author SHA1 Message Date
Pete Goodfellow 9df2455cfb Speeds up walking from 7 delay to 4. Removes the hardcoded walk/running delays, and uses the config options instead. 2014-01-19 19:44:11 +00:00
fleure 05e96e477d Merge pull request #2424 from RobRichards1997/18/01/2014-Cyborg-Debraining 
Fixes not being able to debrain augmented humans
 2014-01-19 03:42:57 -08:00
MrPerson adbb273221 Merge pull request #2419 from KazeEspada/goodbyespaceworms2014 
removes space worms
 2014-01-18 23:24:22 -08:00
fleure 41af5a264f Merge pull request #2414 from Razharas/BorgsMASTA!!--SPAAAAAAAAAAAAAAAKU!! 
Fixes borgs sparking when hit with 0 damage items
 2014-01-18 17:28:52 -08:00
fleure 65729c6500 Merge pull request #2418 from hornygranny/necrophilia 
Animal necrophilia removed
 2014-01-18 17:23:58 -08:00
Giacom 3a77ff99f7 Merge pull request #2407 from hornygranny/chameleonfix 
Chameleon jumpsuit fix
 2014-01-18 12:29:44 -08:00
Cheridan b4f1e03341 Merge pull request #2285 from ChuckTheSheep/Botany 
Irrigation Botany Changes
 2014-01-18 12:12:38 -08:00
Robson Richards 0af17afec7 fixes not being able to debrain augmented humans 2014-01-18 12:26:00 +00:00
Cheridan 9468c30e05 Merge pull request #2374 from tgstation/501 
Merging 501 with Master.
 2014-01-17 21:33:46 -08:00
KazeEspada f693f58e49 removes space worms :(. They are in a better place now. 2014-01-17 19:32:31 -07:00
Hornygranny 401455f1d0 Fixes animal necrophilia 2014-01-17 17:07:52 -08:00
fleure e7951aa5f1 Merge pull request #2310 from KazeEspada/papercupsshallconsumetheworldwiththeirtrash 
paper cups
 2014-01-17 16:43:15 -08:00
KazeEspada 8f25508df0 Fixes an accidental oversight in replenishing cups. It now turns paper into cups using magic. 2014-01-17 17:37:57 -07:00
Jittai 5d51eb65e3 FindConnected Fix 
FindConnected was using src in getstep instead of "a" the processing atom.
 2014-01-17 19:06:11 -05:00
Jittai 70729846ab Fixes Icon Update Issues Found 2014-01-17 18:56:28 -05:00
Razharas 44a48654c3 Fixes borgs sparking when hit with 0 damage items 
Fixes #1710
 2014-01-18 03:55:50 +04:00
Jittai cf8871342a Whoops 2014-01-17 18:33:05 -05:00
Hornygranny 4a9c6a005d Added check for location 
Corrected wrong sprite variables in original
Added notices
 2014-01-17 15:11:35 -08:00
fleure 9e57eeb59b Merge pull request #2389 from Rolan7/HydroCargoPoints 
Hydro cargo points
 2014-01-17 15:10:47 -08:00
fleure 3662c3e5bf Merge pull request #2394 from hornygranny/master 
fix for Thirteen Loko recipe
 2014-01-17 14:56:23 -08:00
Jittai f9cd65e424 Fixes Order of Operations 2014-01-17 17:20:41 -05:00
KazeEspada f5ce877623 Merge branch 'master' of https://github.com/tgstation/-tg-station into papercups 2014-01-17 13:51:31 -07:00
Hornygranny fd0b2551a8 Added indent to fix spawn 2014-01-17 12:24:47 -08:00
Hornygranny d735e0f980 Fixes chameleon jumpsuit not flashing colors when EMPed 2014-01-17 12:19:14 -08:00
fleure 89bb6b8547 Merge pull request #2391 from ManeaterMildred/MechUpdate 
Mech Update : Gygax, Ion and Carbine
 2014-01-17 10:02:39 -08:00
KazeEspada e6a11a2a6e adds a cup limit to the water cooler. 
Fixed a potential bug I may of caused involving reagent dispensor ex_act and blob_act.
 2014-01-17 09:58:47 -07:00
Miauw 9c68b28425 Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid 2014-01-17 17:51:37 +01:00
Hornygranny c1727579e4 fix for Thirteen Loko recipe 2014-01-16 15:36:42 -08:00
Rolan7 50387aa9d4 Eggyseeds set to 0 rarity because they're in "exotic seed" crates from CentComm. 2014-01-16 17:33:28 -05:00
ManeaterMildred 4daac07f20 -Copypasted the old indentation and fixed the bullet path 
type because I'm dumb
 2014-01-16 23:01:40 +01:00
Rolan7 d7e77c44bc Updated a bunch of \blue and \red to span tags. 
Moves the seed check into the original loop along with plasma since sorting the seed list wasn't worthwhile.
 2014-01-16 15:44:56 -05:00
Cheridan cfd9c1e1ee Merge pull request #2381 from Aranclanos/OreBoxes 
Mineral boxes, ore locations fix
 2014-01-16 12:44:56 -08:00
Miauw 6704a9948d Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid 2014-01-16 19:46:04 +01:00
ManeaterMildred e24ce7681f Nerfed the incendiary bullets (The Mech Carbine ammo) to only 
5 Brute but retain his incendiary effect.
 2014-01-16 16:38:46 +01:00
ManeaterMildred e965ab5b63 Changed the name of the Carbine to give a hint of his incendiary abilities. 2014-01-16 16:37:43 +01:00
fleure 088e9fb80a Merge pull request #2354 from Incoming5643/slimetime 
Slime Mob Refactor
 2014-01-16 06:20:03 -08:00
Rolan7 72ee3703fb Switched to an associative list for the list of discovered plants. 
Removed a grown-species lines I had commented out and forgotten to remove.
 2014-01-16 03:11:52 -05:00
Rolan7 aa21029431 Merge branch 'master' of https://github.com/tgstation/-tg-station into HydroCargoPoints 2014-01-16 01:21:33 -05:00
Rolan7 86c8b8ffa7 Fixes the species property for grown items by removing it (it wasn't being set by slimes or spawn, and was pointless). 
Removes some debug lines.
Puts the shuttle timer back to 1200.
 2014-01-16 01:20:56 -05:00
Aranclanos 470e323fda Mineral boxes will now handle properly the movements of the mineral ores when a player click on them with one. 
Fixes issue 2352
 2014-01-15 20:08:35 -03:00
Giacomand a8b754f42f Merge branch 'master' of https://github.com/tgstation/-tg-station into 501 2014-01-15 19:01:15 +00:00
Giacomand 6e3a3ce549 Merge branch 'master' of https://github.com/Giacom/-tg-station into 501 
Conflicts:
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/modules/mob/living/carbon/human/life.dm
	icons/mob/screen_gen.dmi
 2014-01-15 18:32:55 +00:00
Giacom 42551d54e7 Merge pull request #2138 from Cheridan/hydro 
[501] Hydroponics Plant Size Scaling
 2014-01-15 10:16:04 -08:00
Incoming 71c4ba80ad spans metroid.dm 2014-01-15 13:01:34 -05:00
Rolan7 e3bdac9a95 Adds a rarity value to seeds. CentComm gives points for rare seeds, and for high-potency samples. 2014-01-15 03:37:10 -05:00
Cheridan 06ee11e61f Merge pull request #2369 from sirbayer/srsbsns-panicmeleedoesntwork 
Fixes humans not taking melee damage.
 2014-01-14 23:53:09 -08:00
sirbayer 210ee363d6 i missed exactly one 2014-01-14 23:46:55 -08:00
Cheridan b66ab8dc1e Merge pull request #2317 from Miauw62/honk 
fixes server-breaking lagloops of disposal tiles.
 2014-01-14 19:02:14 -08:00
ChuckTheSheep f910bb55bb Fixed the runtime error stopping the whole code 2014-01-14 14:23:45 -05:00
Cheridan 8aaf10feb4 Merge pull request #2197 from sirbayer/srsbsns-deadlyboolets 
Gun Revamp 2: Gun Harder: Director's Cut
 2014-01-14 11:10:05 -08:00