4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
e37394e8fa
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/human_helpers.dm
code/modules/reagents/reagent_containers/food/snacks.dm
2015-10-25 20:28:48 +01:00
d845a2f587
Generalizes the feed and force feed checks.
2015-10-23 10:57:55 +02:00
8305404a14
Can no longer use utensils to eat if you lack the means.
...
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes #11333 .
2015-10-22 16:52:07 +02:00
af52b475ff
Fixes missing cooldowns, missing cult blade sound.
2015-09-09 15:15:43 -04:00
068d02c28c
Refactors various item attack() implementations
...
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.
2015-09-08 23:39:33 -04:00
9b4d09c974
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/_helpers/unsorted.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/grenades/emgrenade.dm
code/modules/clothing/spacesuits/rig/rig_attackby.dm
2015-07-11 10:58:49 +02:00
01104eda45
Fixes utensil force dividers.
...
Fixes utensil knives deal more damage than a chopping knife, and spoons being a potentially deadly weapon.
2015-07-08 01:37:07 -04:00
c77605265c
code/game/objects, code/game/machinery merge fix
2015-06-02 20:18:45 +01:00
ed34aa2466
Rebalancing and adjusting divisors for all weapon damage values.
2015-05-17 16:51:55 +09:30
b8ca15f541
Tweaks/fixes and greyscale icons.
2015-05-17 00:07:29 +09:30
150b24023e
Renamed kitchen utensils.
2015-05-16 21:24:36 +09:30
f27ddd548f
Restructuring a bunch of files in prep for widespread path changes.
2015-05-16 20:09:28 +09:30
Neerti