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

2954 Commits

Author SHA1 Message Date
Iamgoofball b1f60a6114 GOONCHEM 5.5: MORE TOXINS 2015-02-28 12:26:34 -08:00
TheVekter b794cf5211 New Botany backpack and satchel. Also fixes satchel spawning without iconstate. 2015-02-27 20:02:24 -06:00
TheVekter abee661784 Adds in Nienhaus' departmental backpacks and fixes itemstate for a few satchels. 2015-02-26 23:39:27 -06:00
Cheridan bcd3a5b3b7 Fixes metal foam dispenser mode for atmos backpack tank. 
>>you will never refactor something without overlooking something dumb and breaking it
 2015-02-26 22:26:12 -06:00
Remie Richards 4a01237141 Buffs spear pain multiplier from 2 to 3, Makes spears embed when thrown by a human. 2015-02-26 17:24:48 +00:00
Remie Richards 1e8324c3c5 Exposes all embedding related multipliers as variables and definitions. Only items of throw_speed 4 or more can embed now, Explosions force their object to be thrown at 4, this throw_speed threshold is ON TOP of needing to be a can_embed() object. 2015-02-26 17:04:00 +00:00
phil235 809a1be279 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants 
Conflicts:
	icons/mob/head.dmi
 2015-02-25 18:50:42 +01:00
Razharas 588c79873f Merge pull request #7562 from Iamgoofball/drugs 
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
 2015-02-25 08:26:21 +03:00
Iamgoofball c0ae53a566 changes and shit, adds prespawn colorful smoke grenade for fun times and adminning 2015-02-24 20:15:06 -08:00
Remie Richards b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams 
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
 2015-02-24 22:16:53 +00:00
phil235 2d5fe2b41e Merge pull request #7922 from Mandurrrh/clownbugs 
Fixes #7910 and #7909 clown related bugs.
 2015-02-24 18:56:30 +01:00
hornygranny b49a5a934c Merge pull request #7918 from paprka/weldingshitty 
Fixes welding tools using fuel when switched on
 2015-02-23 15:52:25 -08:00
Razharas e889ee7a42 Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding 
Items Embedding in Limbs
 2015-02-24 01:22:01 +03:00
hornygranny c0c8a739e2 Merge pull request #7721 from paprka/miening 
Mining & mine-related chem changes
 2015-02-22 20:17:24 -08:00
Mandurrrh e03d98786b Fixes #7910 and #7909 clown related bugs. 2015-02-22 20:53:39 -05:00
paprka 8c1af4da25 welder fuel usage on switch 2015-02-22 14:15:04 -08:00
phil235 bd870d649c Adds new plants to botany (rice, oat, blue cherries, holy melon, parsnip, geranium, lily, snap corn, blumpkin, mimana, sweet potato, vanilla, red beet) and adding two new reagents (vanilla and rice). 2015-02-22 22:10:25 +01:00
Razharas 55208e408d Merge pull request #7419 from paprka/beltoveray 
adds a simple overlay system for belts
 2015-02-20 07:06:20 +03:00
Remie Richards 42fe551665 Merge branch 'master' of https://github.com/tgstation/-tg-station into ExplosionsAndEmbedding 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-02-19 18:16:33 +00:00
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite. 
Items reset their pixel_x and pixel_y values on pickup.
 2015-02-19 13:02:43 +00:00
hornygranny 7905cc618d Merge pull request #7773 from phil235/HoloSignFix 
Fixes the holosign projector sign count not increasing after destroying old signs.
 2015-02-18 12:59:50 -08:00
phil235 cf3f03c039 Merge pull request #7479 from paprka/batonshit 
Makes batons slowly lose charge when left on
 2015-02-18 21:49:25 +01:00
phil235 67f4cc75d9 Fixes the holosign projector not increasing after destroying old signs. 2015-02-16 22:57:06 +01:00
Cheridan 15439b8c4e Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix 
Conflicts:
	code/game/gamemodes/wizard/artefact.dm
 2015-02-15 10:27:50 -06:00
paprka 743af3a5b2 processing |= 2015-02-14 19:43:27 -08:00
paprka f6942bb955 Merge branch 'miening' of https://github.com/paprka/-tg-station into miening 2015-02-14 17:26:19 -08:00
paprka b67f9cec72 Merge branch 'master' of https://github.com/tgstation/-tg-station into miening 2015-02-14 17:08:39 -08:00
Cheridan 5e0e4828bd Merge pull request #7706 from phil235/TrackImplantFix 
Fix tracking implant description when inserted inside implant pad.
 2015-02-14 15:57:16 -06:00
paprka 24cef3c30a fixes baton looping 2015-02-14 12:41:37 -08:00
phil235 135293bedf Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration. 
Fixes Alien embryo processing that was processed twice.
 2015-02-14 14:18:49 +01:00
Iamgoofball c119fede36 sponsored by DaZe 2015-02-13 23:40:43 -08:00
paprka 85675e92b8 my good judgement gets the better of me 2015-02-13 21:50:00 -08:00
paprka 88760896ad initial commit 2015-02-13 20:59:39 -08:00
paprka 46d21ae2c2 robots lose power from their cell for leaving their baton active 2015-02-13 17:48:58 -08:00
phil235 9bd3c1d8a6 Fix tracking implant description when inserted inside implant pad. 2015-02-13 20:09:48 +01:00
Remie Richards ab754b6182 Corrects all spellings of Embedds --> Embeds 2015-02-13 13:15:20 +00:00
Remie Richards 34ced43f45 Explosions throw items, items can embed in limbs, embedded items cause damage, embedded items can fall out, surgery for embedded item removal, ninja throwing stars! 2015-02-13 12:59:02 +00:00
phil235 897618d42f Fixed some recipes in chef recipes book. Fixed jelly sandwich recipes. Remove unused milk/soymilk carton sprites from drinks.dmi 2015-02-12 21:39:20 +01:00
Cheridan 216630f1db Merge pull request #7572 from phil235/CookingOverhaul 
Cooking overhaul
 2015-02-12 08:01:17 -06:00
Remie Richards 6613851028 Merge pull request #7593 from Cheridan/pin_fix 
Pin fixes, additions
 2015-02-12 06:43:11 +00: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 65e8a4ce31 Merge pull request #7624 from paprka/defibfuckupv2 
Defib changes
 2015-02-11 08:37:28 -06:00
Swag McYolosteinen 147b2fc28a Merge pull request #7578 from Deantwo/BoomBoomBoom 
Fixes stock grenades
 2015-02-10 17:47:29 +01:00
Swag McYolosteinen 6542a0b706 Merge pull request #7620 from xxalpha/briefcasescam 
Fix syndicate briefcase not having cash.
 2015-02-10 17:42:15 +01:00
Swag McYolosteinen da326b30d3 Merge pull request #7553 from Menshin/yet_another_atmos_fix_bundle 
Yet Another Atmos Fixes Bundle
 2015-02-10 17:41:56 +01:00
paprka 8150750a4d removes unnecessary else if( 2015-02-09 10:29:59 -08:00
xxalpha 1b24461841 Fix syndicate briefcase not having cash. 
Fix returns, fix everything.
 2015-02-09 18:06:20 +00:00
paprka 89bbb80d1c small change 2015-02-08 17:09:31 -08:00
paprka 3e61bba236 defib changes 2015-02-08 17:06:34 -08:00
Cheridan 6d3584fa63 Pin Fixes 
Implant pins now require the actual specific implant instead of allowing any implant at all.
 2015-02-07 09:43:03 -06:00