Commit Graph

10 Commits

Author SHA1 Message Date
phil235 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
Jordie0608 4a82ff1564 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
Conflicts:
	code/modules/reagents/reagent_containers/bottle.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/syringes.dm
2015-01-21 16:54:40 +11:00
pudl dd5c7db5ad in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.
12x syringe
10x styptic patch
10x silver sulf patch
4x charcoal bottle
4x epinephrine bottle
4x morphine bottle
4x diphen bottle
3x potassium iodide bottle
5x salglu bottle
3x atropine bottle
6x spaceacillin syringe
10x calomel syringe
10x salbu pill
10x mannitol pill
5x mutadone pill
4x health analyzer
2x crew monitor
CONTRABAND:
all of the same except with 3 bottles of toxin

the two types of wallmed have been combined into one wallmed, which contains all of the above except halved. in instances where the number was odd, the higher of the two numbers was taken.

medical closet has been stocked with a lot of new stuff.
2x beakers
2x droppers
1x medical belt
1x syringe box
1x toxin bottle
2x morphine bottles
3x epi bottles
3x charcoal bottles
1x rxglasses box

this, of course, 3 new pills and 3 new bottles in code so they could be in the nanomed.

gives genetics a bottle of mutadone pills on box and eff3 and puts a public bottle of epinephrine on the medbay desk. adds a single syringe to boxstation's medical storage.

medkits now have some new equipment.

normal
2x styptic patch
2x sulf patch
1x salicyclic pill
1x health analyzer

fire
4x silver sulf patches
1x health analyzer
1x epipen
1x salicyclic pill

toxin is unchanged

oxygen
4x salbu pills
2x epipen
1x health analyzer

all maps and z levels are updated for this.

renames styptic patch to brute patch and silver sulf patch to burn patch. renames charcoal bottle to antitoxin bottle

adds myself to admins.txt
2015-01-20 22:26:13 -06:00
Jordie0608 3bd637b186 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew()
Conflicts:
	code/modules/reagents/reagent_containers/bottle.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/reagents/reagent_containers/patch.dm
	code/modules/reagents/reagent_containers/pill.dm
2015-01-19 18:28:38 +11:00
Jordie0608 a643ecdfcc Food and drinks refactor 2015-01-19 18:06:15 +11:00
Iamgoofball b83ca5f8d1 Goon Chemistry: Addiction and Overdosing 2015-01-18 21:50:54 -08:00
Jordie0608 679b03e6e9 WIP reagent container spawning refactor 2015-01-17 18:19:17 +11:00
Iamgoofball f3398e58a9 Removes Star Trek chemistry and transfers us to Goon Chemistry. 2015-01-16 17:21:36 -08:00
Iamgoofball ea23814a94 Goon Chemistry Commit 4
Adds epipen as per request by @quiltyquilty

Quick-fix for Krokodil making you into a zombie, your skin falls off, you don't become a zombie

Adds a Morphine medipen as per request of @paprika

Accidentally added frost oil bottles back in while trying to fix a merge conflict, whoops.

forgot to remove cyanide since we replaced it with the goon variant

Fixes and Tweaks
2015-01-11 11:48:31 -08:00
Iamgoofball 097689e16a Makes CLF3 work, fixes the Heater, adds Chemical Patches 2015-01-11 10:33:19 -08:00