Commit Graph

29 Commits

Author SHA1 Message Date
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05: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
mwerezak
080e365911 Prevents attacking yourself with items unless on harm intent 2015-09-08 23:51:40 -04:00
mwerezak
41f52b3dd7 Adds some documentation to item_attack.dm 2015-09-08 23:41:50 -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
mwerezak
6ceffaacb5 Refactors item_attack.dm
Refactors and cleans up item_attack.dm and related mob attack code
2015-09-08 23:23:31 -04:00
mwerezak
32b95445e3 Gives changeNextMove() a better name, default define 2015-06-30 22:29:45 -04:00
Kelenius
0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm
2015-06-07 14:05:54 +03:00
mwerezak
3f5976bc3b Updates knifing
Fixes weirdness with knifing where attempting to knife someone before
`world.time >= (G.last_action + 20)` could be met.

Knifing damage scales with weapon force and an attempted measure of
throat protection.

Knifing switches on harm intent.
2015-05-31 11:36:38 -04:00
Kelenius
6d54e1c655 Merge branch 'dev' into ofClicksAndCooldowns
Conflicts:
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/mob_grab.dm
2015-05-21 17:00:50 +03:00
mwerezak
20b72b9911 Adds attack animation calls 2015-05-20 00:18:32 -04:00
Hubblenaut
32b463237f Final adjustments to icons, adds delay to pinning 2015-05-12 17:21:37 +02:00
Hubblenaut
1b3ddb8633 Merge remote-tracking branch 'upstream/dev' into dev
Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/mob/mob_grab.dm
2015-05-12 14:39:21 +02:00
PsiOmega
b52cf35680 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/projectiles/projectile.dm
2015-05-12 13:40:47 +02:00
ccomp5950
569e785014 Holodeck items no longer spam admin attack logs.
/obj/items now has no_attack_log variable if set to 1, it won't log.

All holodeck items and lasertag weapons have no_attack_log set.

<3 Mangled
2015-05-11 22:11:46 -04:00
Hubblenaut
fb8812d1b7 Adds knifing, pressing eyes, jointlocking, headbutting, pushing, dancing and forcing onto the floor
fixup
2015-05-10 17:54:34 +02:00
Kelenius
3fa79f8d51 Removes click cooldowns almost everywhere.
Still have: doors, windoors, cameras, windows, grilles, blobs, resisting, alien stuff, mechas, spray bottles.
Setting changeNextMove is now responsibility of the item being attacked.
Adds a config option to eliminate click cooldowns completely. Intended to be used by devs.
2015-05-09 17:27:19 +03:00
Zuhayr
9c92d3851a Got various kinds of limb loss plus dislocation working. 2015-03-25 23:11:00 +10:30
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
Ravensdale
1bd1687c81 Fixes runtime error: pick() from empty list 2015-01-13 13:37:07 -08:00
Zuhayr
5d6e805206 Why in the dicks is slime code so HORRIBLE. Removes a very redundant piece of code in obj/item/attack() dealing with slimes. 2014-12-24 04:19:56 +10:30
mwerezak
9bfb4642a2 Merge remote-tracking branch 'upstream/dev' into stun-baton
Conflicts:
	code/game/objects/items/weapons/stunbaton.dm
	Made all obj/item/weapons have "swing_hit" as their default hitsound.
	Made hitsound not play when the attack misses.
2014-07-31 14:31:21 -04:00
mwerezak
7130fd124b Stun baton nerf
Adds agonyforce var to stun batons, which causes halloss and eye blur.

Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.
2014-07-31 13:39:06 -04:00
Kelenius
aad89409de Slime update 2014-07-13 17:37:30 +04:00
Mloc-Argent
f5ab084eac Fixes admin attack logs to show up in-game as well as in the logfiles.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-02-25 20:36:46 +00:00
Zuhayr
8850a43dcb Fixes #3847 2014-01-30 23:21:00 +10:30
Chinsky
dcde181bee SOMEONE did not put surgery things on new clickcode, so I done that. 2013-10-16 17:14:09 +04:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG.
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:27:39 +01:00