Zuhayr
565e39a28f
Porting forensics from Aurora.
2015-12-10 19:16:28 +10:30
Yoshax
db7af654ec
Adds checks to ensure target is valid, adds user feedback
2015-12-05 15:10:10 +00:00
Yoshax
4c201d8219
Adds ability to smash bottles on things other than people's heads
2015-12-05 14:22:40 +00:00
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
7d4f51be8e
Merge pull request #10287 from mwerezak/attack-cleanup2
...
Refactors item attack click and mob melee attack handling code
2015-10-25 08:43:47 +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
PsiOmegaDelta
0b9b8feb1e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
2015-10-21 10:38:57 +02:00
PsiOmegaDelta
db833735a8
Merge pull request #11340 from Baystation12/master
...
Dev-freeze.
2015-10-21 10:36:30 +02:00
PsiOmegaDelta
4c96cd62a7
Condiments now check for proximity before continuing with the rest of afterattack. Fixes #11334 .
2015-10-20 17:11:55 +02:00
HarpyEagle
e24313be2e
Fix macro
2015-10-15 07:02:57 -04:00
HarpyEagle
7f066065d3
Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-10-05 19:20:33 -04:00
PsiOmega
5863112d2d
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-09-15 20:31:59 +02:00
PsiOmega
5c1b8380a4
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/tanks/jetpack.dm
code/game/objects/items/weapons/tanks/tanks.dm
2015-09-15 20:25:13 +02:00
GinjaNinja32
e29f5d108c
fix pill attack_log entry, switch to using key_name
2015-09-14 06:24:49 +01:00
mwerezak
26f1d02bda
Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
...
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2015-09-11 18:13:14 -04:00
PsiOmegaDelta
a7fa8cde49
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/void/merc.dm
code/modules/mob/living/living.dm
code/modules/mob/living/simple_animal/borer/borer_captive.dm
code/modules/mob/mob_grab_specials.dm
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
html/changelogs/.all_changelog.yml
2015-09-11 08:54:03 +02:00
mwerezak
8e66d3b31a
Fixes IPCs being knocked unconscious when being hit in the head with a melee weapon
...
Replaces the hardcoded def_zones with a headcheck() proc to handle species who have "brains" are located in non-standard places.
2015-09-09 19:49:46 -04:00
mwerezak
a58f70025d
Adds cooldowns to eating/feeding, allows attacking with reagent containers while on harm intent.
2015-09-09 15:44:46 -04:00
mwerezak
af52b475ff
Fixes missing cooldowns, missing cult blade sound.
2015-09-09 15:15:43 -04:00
mwerezak
6e66ad307c
Refactors bottle smashing, apply_hit_effect() now returns the blocked status.
2015-09-09 13:58:45 -04:00
Chinsky
72d768808a
Merge pull request #10110 from mwerezak/shields
...
Better shield handling
2015-09-03 20:38:48 +03:00
Chinsky
cf0a3f94d0
Merge pull request #10808 from Hubblenaut/dev
...
Bar drinks
2015-09-01 12:56:54 +03:00
Zuhayr
3f6f34c16f
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/mob/holder.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/carbon/human/species/station/station.dm
icons/mob/head.dmi
2015-09-01 11:22:10 +09:30
Zuhayr
14c57fcf11
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/modules/mob/holder.dm
icons/mob/head.dmi
2015-08-31 16:17:24 +09:30
Zuhayr
ac04bdfb52
Readded monkey scooping.
...
Conflicts:
code/modules/mob/living/carbon/human/species/species.dm
2015-08-31 07:01:56 +09:30
mwerezak
0a751322e3
Rewrites shield handling
...
Rewrites shield handling to be less hardcoded.
Shields now take into account the damage source and direction when blocking.
Riot shields no longer block most bullets, but are better at blocking melee and thrown items than they were previously.
Energy shields block projectiles with a similar probability as they did before, and block melee and thrown as well as riot shields do.
Shields no longer block from directly behind the player.
Weapons now only block melee attacks.
Cool effects when blocking with an energy shield or energy sword (including holoswords).
2015-08-26 10:39:31 -04:00
Hubblenaut
38a46f7155
Increases placement cells per turf from 16 to 64
2015-08-22 18:06:54 +02:00
Hubblenaut
9c2cf03e83
Adds bottles for Cola, Space Up and Space Mountain Wind
2015-08-22 18:06:51 +02:00
Kelenius
bed03443d1
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/ZAS/Airflow.dm
code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
mwerezak
b80c01ffbe
Removes *COVERSEYES
...
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
2015-08-18 17:06:49 -04:00
Kelenius
7c1d9b5614
Mech chargers are now a single machine
...
Can be built and upgraded
Resolves #5215
2015-08-16 06:07:36 -07:00
PsiOmega
4cf736bb5c
Compilation fix.
2015-08-15 11:12:43 +02:00
PsiOmega
c81ad0964e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2015-08-15 11:06:03 +02:00
PsiOmega
3a08e2884a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/crates_lockers/largecrate.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/research/circuitprinter.dm
2015-08-15 10:52:17 +02:00
mwerezak
133bc96344
Fixes #10645
...
Sets unacidable where appropriate.
2015-08-14 23:20:10 -04:00
Kelenius
aa318b8d1c
Merge branch 'dev' into ofBeesAndHoney
...
Conflicts:
code/modules/materials/material_recipes.dm
2015-08-14 16:55:21 +03:00
mwerezak
e0965bc2cb
Implements inserting rags into booze bottles
2015-08-13 18:37:17 -04:00
mwerezak
b003e2f94c
Lowers the volume of eggs to 10
2015-08-13 18:37:15 -04:00
mwerezak
498253f056
Splashing atoms now causes a proportion of the chems to land on the target's loc
...
Splashing now differs from trans_to(). A proportion of the splashed chemicals will splash on the target's loc, until a turf is splashed.
2015-08-13 18:37:15 -04:00
mwerezak
b5425e0bd9
Makes beer and ale bottles into actual bottles, adjusts bottle smashing
...
Generalizes opening drink containers, makes beer and ale bottles a subtype of bottle instead of can
Adjusts bottle smashing, duration, damage, and reliability.
2015-08-13 18:37:13 -04:00
mwerezak
5ae15e222c
Bottles smash when thrown using harm intent
...
Throwing a glass bottle at something nearby on harm intent causes it to smash, splashing it's contents over whatever it hits.
If the hit atom is too far away the bottle will not smash. Also it does not smash with 100% reliability.
2015-08-13 18:32:50 -04:00
Kelenius
60196df634
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
Kelenius
65a9e11a52
Merge branch 'dev' into ofBeesAndHoney
...
Conflicts:
baystation12.dme
2015-08-13 08:33:46 +03:00
PsiOmegaDelta
74872e28a7
Compilation fix.
2015-07-24 11:02:39 +02:00
PsiOmegaDelta
f3c9a7224b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/storage/storage.dm
code/modules/reagents/reagent_containers/borghydro.dm
2015-07-24 10:53:57 +02:00
Chinsky
90ae24dd1c
Merge pull request #10135 from Kelenius/ofBorgsAndShakers
...
Of borgs and shakers
2015-07-23 21:41:48 +03:00
Kelenius
b6beb8c299
Admin logs for borg hypo
2015-07-20 09:31:02 +03:00
PsiOmegaDelta
388343a84e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/recharger.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/mob.dm
2015-07-20 08:28:32 +02:00
