Commit Graph

311 Commits

Author SHA1 Message Date
Razharas
a67d8339b7 Merge pull request #8414 from phil235/TablecraftVarietyFix
Fixes not being able to tablecraft recipes using differen kinds of an item
2015-03-22 05:32:43 +03:00
Razharas
2271499db7 Merge pull request #8058 from Iamgoofball/explosive
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
Jordie
af6464d8bf Merge pull request #8223 from phil235/MimanaFix
Mimana fix
2015-03-19 16:44:29 +11:00
phil235
9b419d26f0 Fixes not being able to tablecraft recipes using different types of an item for a requirements (e.g. two types of cutlets to make a meat pizza).
Fixes mushroom requirements in tablecraft recipes appearing as "snacks" in the requirement lists.

Reduces the chem puff waiting time when spraying at short range, so it takes less time before it reacts with a turf/mob/object.
2015-03-18 20:57:30 +01:00
Iamgoofball
7600697c13 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 2015-03-16 21:13:56 -07:00
phil235
78d28a6d64 Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger
Conflicts:
	code/modules/events/ninja.dm
2015-03-15 12:30:27 +01:00
phil235
e3e881e6ee Merge branch 'master' of https://github.com/tgstation/-tg-station into MimanaFix
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
2015-03-15 12:27:40 +01:00
Iamgoofball
d0f101cd37 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm
2015-03-14 21:32:13 -07:00
Cheridan
0b7be73f62 Merge pull request #8286 from phil235/SteelcapFix
Steel cap, sandstone and welding fixes plus flashing refactor
2015-03-14 22:56:37 -05:00
Iamgoofball
7114d5ac04 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-Medicine.dm
2015-03-14 20:00:35 -07:00
Cheridan
9c3ed3da04 Merge pull request #8247 from Incoming5643/Welcome_to_ireland
Explicitly passes a mobs mutant_color in blood samples
2015-03-13 15:22:14 -05:00
phil235
29609457f5 Makes the message when you're attacked slightly bigger for better visibility."
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
phil235
7ba8af5222 Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods.
Reorganizes all flashing to use the same mob proc 'flash_eyes()' (welding tool use, flashbang, flashers, laserpointers, etc).
Fixes making sandstone not stacking the result sandstones on the floor.
Sandstone, grass tile and carpet tile now look for other incomplete stack on their creation location to try to put them all in one stack (exactly like wood planks).
Fix typos.
Remove banglet var from all flashbangs, making flashbangs from clusters behave exactly like the other ones.
Renames eyecheck()proc to check_eye_prot() and moves it to mob/living level, elso creates check_ear_prot() for checking ear protection.
2015-03-10 20:30:46 +01:00
Incoming
c9cc003c65 Explicitly passes a mobs mutant_color in blood samples 2015-03-08 20:55:36 -04:00
Iamgoofball
2cee886f04 whoops and shit 2015-03-08 17:02:38 -07:00
Iamgoofball
573aea927b Removes newcrit, fixes, changes, old chems now process every tick as per usual, only goonchems process every 3 ticks now. 2015-03-08 16:43:57 -07:00
Iamgoofball
e6f257d413 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
	code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
2015-03-08 14:26:52 -07:00
phil235
b669f363d3 Fixes mimana not dropping mimanapeel when eaten.
Fixes typo in oat stalks
Fixes Reagent metabolization only calling the reagents on_mob_life procs once every two life().
Moving dizziness, drowsiness and jitteriness natural decreases all inside carbon/handle_regular_status_updates()
Drowzyness now drops faster when resting.
Slight adjustment to mutetoxin effect on mob.
2015-03-08 13:53:23 +01:00
phil235
77d553e619 Fixes disposal climbing.
Aliens, slimes and monkeys can climb into disposal but cannot flush it.
Non carbon mobs can no longer climb into disposal by themselves.
Stuffing another mob in a disposal unit is now only done via grabbing.(fixes bugs like stuffing someone while being inside the disposal yourself)
Large mobs no longer fit inside disposal.
Fixes hydrotray growing overlay layer.
Fixes slicing broken pipes dropping a straight pipe.
Fixes typos.
Removing unused var from disposal.
2015-03-07 19:35:44 +01:00
phil235
12d677a97b Fixes HydroTray Lights sprites. 2015-03-04 02:08:34 +01:00
phil235
d856e240c2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
Conflicts:
	icons/mob/head.dmi
2015-03-02 13:45:15 +01:00
Iamgoofball
b1f60a6114 GOONCHEM 5.5: MORE TOXINS 2015-02-28 12:26:34 -08:00
Iamgoofball
b95f44f235 Loads of pyrotechnics changes 2015-02-27 21:16:10 -08:00
Razharas
926c2f7413 Merge pull request #8027 from Iamgoofball/patch-36
I apparently added morphine to Deus. This was not intended.
2015-02-28 07:00:27 +03:00
Razharas
78e504f33e Merge pull request #7994 from Incoming5643/colormesurprised
Fixes podmen always being sickenly off white upon creation
2015-02-27 11:10:55 +03:00
Iamgoofball
16f319bffd I apparently added morphine to Deus. This was not intended. 2015-02-26 20:27:14 -08:00
Incoming
55512a69e0 Fixes podmen always being sickenly off white 2015-02-25 20:06:18 -05: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
4ba5161394 Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
Conflicts:
	code/modules/hydroponics/seeds.dm

Resolving dem conflicts
2015-02-25 15:17:14 +03: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
phil235
3e100729bc Fixes mimana sprites. Small fix to snap corn picking. Fixes russian revolver not killing you. 2015-02-22 23:02:07 +01: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
Iamgoofball
e24e94544e Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
Conflicts:
	code/modules/food&drinks/food/snacks_meat.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
	icons/obj/drinks.dmi
	icons/obj/food.dmi
2015-02-20 22:00:53 -08: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
Razharas
d775291bdf Made vines cultivatable
Added special proc to all seeds that give plant anazyler special
information if needed in form of list of strings that will be displayed
to user one by one
Added special proc to seeds that make them have some special chem
interactions on growth if needed
Made vine mutations have quality of either good, bad or neutral
Made some chems remove the mutations of certain quality from growing
seeds
Made some chems tweak potency and production of the growing vine seeds
both ways so you can make unmutatable slowly growing vines if needed
Vine seeds now show mutations on the plant analyzing
Cut some copypaste in analyzer proc
2015-02-18 01:27:52 +03:00
Razharas
5d0e800c3d Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
Conflicts:
	icons/turf/floors.dmi

Fixing merge conflicts
2015-02-17 20:33:52 +03: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
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
Swag McYolosteinen
b2d6ce5481 Merge pull request #7668 from dannno/suicidefix
Fixes #7647
2015-02-14 12:12:38 +01:00
Iamgoofball
99cab4ddcb Changes 2015-02-13 18:05:03 -08:00
Razharas
7571189a35 More vines for the god of vines
Added bluespace vines that are able to grow through walls, glass and
anything and everything
Added space-protective vines that change the space into "vineturfs"
which are basically resprited floors
Made vines be able to spread into space
Changed some vinecontroller vars, now you can adjust the speed of
spreading both by capping the max vines per tick and new-vines to
existing-vines spread ratio
Made the chance to mutate per spread be dependant on the potency of the
seed
Made the spreading speed be dependant on productivity of the seed(can be
both slower and faster then current one)
Fixed some potential runtimes with calling destroy() instead of qdel()
where needed
Removed the colon added by carn, its all checked in Enter call few lines
later anyway
I like vines
2015-02-13 01:13:13 +03:00
Cheridan
216630f1db Merge pull request #7572 from phil235/CookingOverhaul
Cooking overhaul
2015-02-12 08:01:17 -06:00
dannno
b34c5180ae modifies and fixes suicide messages for guns and bananas 2015-02-11 22:39:11 -05: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
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
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
phil235
c70d17a8eb Rebalancing vitamin amounts in grown
Fixing some sugar amounts in 2 growns
Fixing error from metastation z2 mapfile.
2015-02-08 22:48:53 +01:00
Iamgoofball
fa32a61494 Loads of new chemicals and changes 2015-02-07 21:55:21 -08:00
Iamgoofball
0864e4a8dc Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
Conflicts:
	code/modules/reagents/Chemistry-Goon-Medicine.dm
	code/modules/reagents/reagent_containers/pill.dm
	icons/obj/drinks.dmi
2015-02-07 15:46:12 -08:00