a81f221589
Merge pull request #8915 from Iamgoofball/patch-54
...
Fixes #8893
2015-04-13 18:24:54 +10:00
3d65b86f0b
Fixes #8893
2015-04-12 01:26:55 -07:00
5f169e8e47
Remove SpeciesCanConsume() proc, replaced by iscarbon checks.
...
Remove alloweat var from masks, remove MASKCOVERSMOUTH flag from mime and clown masks so you can still eat through them.
Some adjustments in surgery checks for bodyparts covered.
Fixes a runtime in weapon/energy attack_verb.
Humans can now CPR monkeys.
Slight changes to CPR code.
Fixes runtime with drones trying to do CPR.
Rewrites /obj/item/weapon/reagent_containers/proc/canconsume to be less shitty.
Adds an is_mouth_covered() proc to carbons to check for mask and headgear with MASKCOVERSMOUTH or HEADCOVERSMOUTH, with argument to restrict the check to only mask or only head.
2015-04-11 22:16:42 +02:00
54154bec12
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
2015-04-07 16:21:07 -07:00
f1b40bf6ae
fixes sodium thiopental bottle
2015-03-22 20:19:21 -07:00
434265afa0
Reagent Decals 2: Black Powder Boogaloo
2015-03-22 02:04:31 -07:00
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
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
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
1732ab6b02
Merge pull request #8311 from phil235/SprayFix
...
Fixes chemsprayer duplicating reagents. Simplifying its code.
2015-03-14 22:59:49 -05:00
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
ecb3a4e08f
Merge pull request #8236 from phil235/DoughChange
...
Dough change
2015-03-13 15:34:39 -05:00
c04468576f
Fixes chemsprayer duplicating reagents. Simplifying its code.
...
Chem puff spray can no longer give more chems to mobs than it contains.
Mobs being in front of the chem puff shorten its total range.
Fixes using the spray at short range not showing the whole chemical puff animation.
For a given max range of a spray, aiming closer will now transfer more chemicals to each mobs/objs/turfs than aiming the furthest.
2015-03-12 19:54:36 +01:00
f6e4c1518d
A restructure/removal/cleanup of Ninja Code
2015-03-09 20:43:56 +00:00
bc091234ee
Changes egg breaking to use reagent_containers/glass/attackby() (fix issue with custom egg salad)
...
You can only break eggs on glass containers (beaker,bucket,bowl,etc)
2015-03-09 19:43:39 +01:00
2cee886f04
whoops and shit
2015-03-08 17:02:38 -07:00
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
bb10824737
Improvised heating fix: Fixes dough recipe from egg + 15u flour beaker.
...
Adds a limit to how hot the beaker reagents can be heated. (no hotter than the heat source)
moving reagent_containers/attackby() to reagents/reagent_containers.dm for better visibility.
2015-03-03 22:35:11 +01:00
c2290c6c5c
Merge pull request #7913 from phil235/NewPlants
...
Adds new plants to botany
2015-03-03 11:23:32 +01:00
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
01b733b2a2
changes and tweaks
2015-02-28 22:13:11 -08:00
747ebbc78d
added improvised heating
2015-02-28 20:51:39 -07:00
b1f60a6114
GOONCHEM 5.5: MORE TOXINS
2015-02-28 12:26:34 -08:00
b95f44f235
Loads of pyrotechnics changes
2015-02-27 21:16:10 -08:00
e4eeed69bc
Merge pull request #7976 from Jordie0608/bioterrorreportedasleastpopularformasspaceterrorism
...
Fixes bioterror chemsprayer
2015-02-26 02:08:24 -06:00
e89e925fef
removes empty new
2015-02-26 18:53:23 +11:00
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
588c79873f
Merge pull request #7562 from Iamgoofball/drugs
...
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
2015-02-25 08:26:21 +03:00
b931c66f2c
fixes bioterror chemsprayer
2015-02-25 16:08:59 +11:00
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
4735e1c02a
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
2015-02-23 18:47:21 -08:00
c0c8a739e2
Merge pull request #7721 from paprka/miening
...
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
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
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
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
7a40b51d4a
Merge pull request #7731 from Incoming5643/mediborg_drugs
...
Mediborg Improvement Drive: Reefer Madness
2015-02-17 15:37:39 +01:00
022bd22a61
Removes omnizine from mediborgs for having a hidiously deadly overdose mechanic that was making asimov borgs cry and replaces them with the "big three" injectible healers of goonchem. Between them all four typs of vanilla damage are covered.
2015-02-14 14:13:20 -05:00
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
08e8c3f832
fixes stimpack injection
2015-02-13 22:12:19 -08:00
88760896ad
initial commit
2015-02-13 20:59:39 -08:00
575b117a70
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
...
Conflicts:
icons/obj/drinks.dmi
2015-02-10 21:37:49 -08:00
54c40ee0ad
Adds a new species var, exotic_blood, that can be used with species that don't have traditional blood so you can still draw something from them if such a thing logically makes sense.
...
It's used here to allow slime jelly to be drawn from slimepeople (and the far less seen jellypeople)
In both cases slime jelly is produced from nutrition, and will always do so unless you've got either extremely low nutrition or extremely high slime jelly.
Practical effects of this:
*You can kill slimepeople in a few special ways, you can syrigne all the jelly out and once they run out of nutrition to replace it they'll stop breathing, chems that help clear toxins also screw them over BADLY in this way.
*slimepeople get free access to a semipotent toxin whenever they want provided they have a syringe on hand, but have to manage their nutrition if they rely on it.
*Other chems can be syringed wholesale out of slimepeople as well provided they haven't been metabolized yet.
2015-02-08 03:18:50 -05:00
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
eea438c42d
Literal shitton of changes
2015-02-07 15:37:55 -08:00
9bc2137815
man fuck typos
...
Whoops, might wanna update on my end before changing a path.
Fixed typo 'Tequilla'.
2015-02-05 15:43:09 -06:00
f5653fa923
Merge pull request #7500 from Iamgoofball/patch-27
...
Fixes #7493
2015-02-05 18:07:52 +01:00
f6bf89656b
fixes syringes with monkeys, virus transfers, and iv drip feedback
2015-02-04 12:21:05 -08:00
0645d46168
iv drip hotfixes
2015-02-03 18:34:32 -08:00
80913f143b
Merge pull request #7239 from paprka/ointmentandshit
...
BLOOD FOR THE BLOOD GOD
2015-02-03 16:30:42 -06:00
48413b4a89
makes roundstart pills append their reagent number to their name, only roundstart ones do this
2015-02-02 18:35:51 -08:00
Jordie
Iamgoofball
phil235
Razharas
Cheridan
Remie Richards
phil235
Swag McYolosteinen
Delimusca
hornygranny
Incoming
paprka
TheVekter