Commit Graph

1058 Commits

Author SHA1 Message Date
Jordie 4c1a1c8c87 Merge pull request #8967 from phil235/BundleFix1
A big bundle of fixes
2015-04-16 18:18:53 +10:00
Cheridan a9002da949 Merge pull request #8776 from Xhuis/its_time_for_slimeperson_on_slimeperson_action
Adds an additional effect to green slime cores
2015-04-15 08:53:55 -05:00
Swag McYolosteinen 5e6cbd57cd Merge pull request #8916 from Iamgoofball/patch-55
Fixes and changes Napalm Recipe
2015-04-15 13:03:14 +02:00
phil235 081bae6740 Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
Xhuis 87541dabc2 Progress 2015-04-13 19:12:29 -04:00
Jordie a81f221589 Merge pull request #8915 from Iamgoofball/patch-54
Fixes #8893
2015-04-13 18:24:54 +10:00
Jordie e9d264ba55 Merge pull request #8881 from phil235/SentiencePotionFix
Fixes invisible snacks and mobs from gold and silver slime reaction.
2015-04-13 18:23:40 +10:00
Jordie 322bad016f Merge pull request #8795 from Incoming5643/technically_just_another_pacid_blob_nerf
Adds three new blob chems
2015-04-13 18:23:05 +10:00
Jordie d8ef9ecb44 Merge pull request #8777 from CosmicScientist/SpaceCarpTatorItem
Adds space carp traitor item and carp plushie "attack"
2015-04-13 18:22:53 +10:00
Iamgoofball 5e908597b6 Fixes and changes Napalm Recipe
turns out I 1. forgot to make it actually produce the reagent, and 2. forgot to change the recipe
2015-04-12 01:30:02 -07:00
Iamgoofball 3d65b86f0b Fixes #8893 2015-04-12 01:26:55 -07:00
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
Xhuis 585fc2f62d Makes the toxin work on all species 2015-04-11 15:32:51 -04:00
CosmicScientist bfbc7c40a8 Should be up to date now. 2015-04-11 14:39:37 +01:00
CosmicScientist 0e0f8c4720 Fixed code, carp won't attack owner, corrected spelling. 2015-04-11 03:48:08 +01:00
phil235 f7b51889e1 Fixes invisible snacks and mobs from gold and silver slime reaction. 2015-04-10 22:54:26 +02:00
phil235 e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
Iamgoofball c06ad7e6b8 moved process() to datum. made /datum/reagents/ process instead of the containers. 2015-04-07 17:13:59 -07:00
Iamgoofball 54154bec12 Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive 2015-04-07 16:21:07 -07:00
Incoming 1e2187083f Adds three new blob chems:
Omnizine blobs inject omnizine on hit, which initially HELPS mobs fighting it, but if they aren't careful in how often the blob hits them, they can rapidly fall into a very painful and hard to treat overdose. Three hits will inflict a heavy damage over time effect, more than that will inevitably cause death without treatment. They're a pleasent light lavender color.

Morphine blobs inject morphine on hit, which will keep mobs from slowing down but eventually will make them fall asleep. One hit will force a very small sleep after a while of fighting, multiple hits will forces longer sleeping after the same delay and overdose mechanics that make people drop held items and do minor tox damage. They're gunmetal grey.

Space Drugs will inject space drugs on hit, which makes mobs stumble around and make backing off from the blob more difficult. It also does minor on hit toxin damage. It's a weedy green.

Adding more blob chems makes any one chem type rarer, so I feel like this is one of the more fun ways the strength of some blob chems can be mitigated.
2015-04-06 18:18:16 -04:00
Xhuis 2e312cb510 Adds unstable mutation toxin 2015-04-05 22:02:41 -04:00
CosmicScientist 13060bb6f4 Adds space carp traitor item and fun for carp plushie. 2015-04-06 02:04:16 +01:00
phil235 f9f618d699 Adding the chemical reactions and recipes for the new recipes.
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
2015-04-04 19:29:12 +02:00
Swag McYolosteinen d8c588867a Merge pull request #8634 from sawu-tg/master
See #7217
2015-03-31 19:40:33 +02:00
Sawu bfd0436324 See #7217
* Spraycans are given to Revheads
* Spraycans act as instant use crayons.
* Spraycans can be used on walls.
* Spraycans can be used as ghetto pepper spray, but leave the target with a coloured face (can be removed with space-cleaner)

(Old pictures, there is now only one can that changes color)

![can1](https://cloud.githubusercontent.com/assets/3829126/5812999/c3992e38-a0c9-11e4-8620-3e1ecbc97630.PNG)
![can2](https://cloud.githubusercontent.com/assets/3829126/5813002/c92d56d0-a0c9-11e4-8592-6ae15f594ca8.PNG)
![cap3](https://cloud.githubusercontent.com/assets/3829126/5825994/88a9260a-a143-11e4-8cd7-cd4491b0db2a.PNG)
![can4](https://cloud.githubusercontent.com/assets/3829126/5828055/28766ffc-a154-11e4-8bfb-f8475c84c6a4.PNG)
2015-03-31 02:26:05 +11:00
Jordie c8e0c16d09 Merge pull request #8520 from MrPerson/effect_cleanup
Effect pooling
2015-03-30 01:21:40 +11:00
phil235 1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
2015-03-26 02:31:06 +01:00
phil235 92b0f9f4cd Adding a changelog.
Some work on death() procs of many animals.
Replacing most istype(XYZ, mob/living/simple_animal/slime) by isslime(XYZ).
Some work on slime feeding procs.
Made simple animal aliens see in the dark like regular aliens (in case somone wants to control one).
2015-03-26 02:23:39 +01:00
Jordie 66ab60d5e1 Merge pull request #8476 from Pennwick/master
Adds Chem Master board
2015-03-25 16:29:41 +11:00
MrPerson b6c71dc50d Effect pooling
obj/effect/effect all pool themselves.
PoolOrNew() can now be passed a type and a list instead of a type and a location. In that case, the list will be passed to New() via arglist().
RCD's now delete their spark system and properly garbage collect.
2015-03-24 11:44:49 -07:00
hornygranny 979d308f49 Merge pull request #8497 from Iamgoofball/patch-46
fixes sodium thiopental bottle
2015-03-23 16:34:01 -07:00
phil235 17fb919020 More fixes 2015-03-23 17:11:07 +01:00
phil235 ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
Cheridan beacf0cf4a Merge pull request #8349 from MrPerson/qdel_reagents_hopefully
Fix reagent garbage collection hopefully
2015-03-23 08:55:11 -05:00
Cheridan 6543b5c1e9 Merge pull request #8461 from Iamgoofball/patch-45
Fixes the zombie powder recipe
2015-03-23 08:39:16 -05:00
Iamgoofball f1b40bf6ae fixes sodium thiopental bottle 2015-03-22 20:19:21 -07:00
Pennwick b69d08593e Correct errors spotted by Razharas 2015-03-22 18:50:59 -05:00
Razharas 6baed3a0e5 Merge pull request #8464 from Szunti/patch-1
prob() with rand() is the same as a plain prob()
2015-03-23 00:27:47 +03:00
Swag McYolosteinen 53e40ec315 Merge pull request #8427 from Cheridan/day3_collars
Event Day 3 - Pet Collars!
2015-03-22 19:37:12 +01:00
Iamgoofball 434265afa0 Reagent Decals 2: Black Powder Boogaloo 2015-03-22 02:04:31 -07:00
MrPerson 9229f72573 Fix up certain chemicals to not overwrite Del(). Meh.
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_reagents_hopefully

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
2015-03-21 23:04:53 -07:00
Pennwick 18d55956a7 Update Chemistry-Machinery.dm 2015-03-21 22:37:55 -05:00
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
Pennwick 5261040cdf Update Chemistry-Machinery.dm 2015-03-21 19:23:37 -05:00
Pennwick cdefe65ae2 Update Chemistry-Machinery.dm 2015-03-21 18:50:28 -05:00
Pennwick 5873aff8de Update Chemistry-Machinery.dm
Added a constructable Chem Master 2999. Unlike the 3000 it cannot be wrenched and drug around.
2015-03-21 17:47:37 -05:00
Szunti 01c18eadca Replaced prob(rand(A,B)) with prob((A+B)/2).
They are the same probability.
Rounded to integers where the values were literals.
2015-03-21 19:12:16 +01:00
Iamgoofball 283170316d Fixes the zombie powder recipe 2015-03-21 00:09:06 -07: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
Iamgoofball 829045231b fixes shit 2015-03-20 23:41:55 -07:00