Eearslya Sleiarion
868413c880
Polaris Sync October 9th ( #633 )
2016-10-09 18:55:29 -04:00
SinTwo
7192bf08fd
item_state cleanup
2016-07-11 22:31:32 -04:00
Yoshax
cd9fdd228b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall
2016-05-28 20:22:09 +01:00
Yoshax
e2c66a3bf2
Weapon sharpness and edge adjustments
2016-05-12 16:13:41 +01:00
mwerezak
4951790b50
Fixes missing cooldowns, missing cult blade sound.
...
Conflicts:
code/game/objects/items/weapons/material/kitchen.dm
2016-04-22 04:58:25 -04:00
Zuhayr
7c3993b68b
Revert "Revert "Bay update.""
2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c
Revert "Bay update."
2016-02-07 16:07:05 +10:30
Zuhayr
e557a71fdc
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2016-01-20 08:01:14 +10:30
Zuhayr
d0717791dc
Fixes #270
2016-01-14 00:33:31 +10:30
Zuhayr
f93ea6a78f
Tweaks to previous commits.
...
More tweaks to IPC fixes.
Merge resolution/compile fixes.
Further work on properly integrating, updating and fixing prosthetic options.
Repathed internal organs to organ/internal.
More work on full synthetics, changelings, overheating.
Working on getting organs to qdel properly and spawn properly when robotized.
Finalized some overheating values, added remaining prosthetic icons.
Finalizing the testing version of the full prosthetic bodies branch.
Added suit cyclers to the autolathe and map.
Fixing runtime errors.
Fixing errors.
Changelog.
Replacing limb and organ strings with constants.
Prevented brainless species from becoming full cyborgs.
Fixed issues with brain/MMIs renaming themselves inappropriately.
Various fixes and oversights.
2015-12-24 21:13:40 +10:30
PsiOmegaDelta
c78f98754a
Utensils now respect the lack of mouths, and has a delay on feeding others.
2015-12-20 11:46:42 +01:00
PsiOmegaDelta
5d3d0c5dc3
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/material/kitchen.dm
2015-12-20 11:22:08 +01:00
Spamcat
905070bc96
\the
2015-12-16 20:30:26 +03:00
Spamcat
8df6ee3318
\red >> styles
2015-12-16 20:21:10 +03:00
Spamcat
485a2fdd45
Made kitchen utensils less dangerous.
...
#11370
2015-12-16 20:07:35 +03:00
Zuhayr
1ea7aebb62
Added boot knives and putting a knife in your boot.
2015-12-11 15:55:23 +10:30
Neerti
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
PsiOmegaDelta
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
PsiOmegaDelta
d845a2f587
Generalizes the feed and force feed checks.
2015-10-23 10:57:55 +02:00
PsiOmegaDelta
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
mwerezak
af52b475ff
Fixes missing cooldowns, missing cult blade sound.
2015-09-09 15:15:43 -04:00
mwerezak
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
PsiOmegaDelta
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
mwerezak
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
GinjaNinja32
c77605265c
code/game/objects, code/game/machinery merge fix
2015-06-02 20:18:45 +01:00
Zuhayr
ed34aa2466
Rebalancing and adjusting divisors for all weapon damage values.
2015-05-17 16:51:55 +09:30
Zuhayr
b8ca15f541
Tweaks/fixes and greyscale icons.
2015-05-17 00:07:29 +09:30
Zuhayr
150b24023e
Renamed kitchen utensils.
2015-05-16 21:24:36 +09:30
Zuhayr
f27ddd548f
Restructuring a bunch of files in prep for widespread path changes.
2015-05-16 20:09:28 +09:30
