Commit Graph

10 Commits

Author SHA1 Message Date
mwerezak
0dc07bafa1 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.

Conflicts:
	code/_onclick/item_attack.dm
	code/game/objects/items/weapons/stunbaton.dm
2014-08-03 15:40:19 -04:00
Kelenius
c54b9e3626 Slime update
Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/metroid/death.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/say.dm
	code/modules/mob/transform_procs.dm
	code/modules/reagents/Chemistry-Recipes.dm
	maps/tgstation2.dmm
2014-07-15 00:50:41 -04:00
alex-gh
4776dfd94f Telebaton now only stuns if it actually hits. 2014-02-14 14:13:03 +01:00
Jesus Hussein Chris
95f7280781 Generic attack sounds for all melee weapons
Overrides the generic sounds with more suitable ones where needed.
Weapons that do no damage don't have sound effects.

Conflicts:
	code/game/gamemodes/wizard/artefact.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/weapons.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
2014-01-22 10:15:43 -05:00
Rob Nelson
22a2df1115 Standardize HULK.
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/items/weapons/swords_axes_etc.dm
2014-01-21 22:45:40 -05:00
Rob Nelson
95cc6a27b5 Standardize mutation constants, remove ambiguity, remove non-implemented muts.
Conflicts:
	code/_onclick/click.dm
	code/game/dna/genes/powers.dm
	code/game/machinery/wishgranter.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_movement.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/damage_procs.dm
	code/modules/mob/living/living.dm
	code/modules/power/lighting.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/setup.dm
	maps/RandomZLevels/wildwest.dm
2014-01-21 22:36:19 -05:00
ZomgPonies
9ad437b8c5 Adding checks for LAssailant everywhere whee 2013-12-23 04:57:44 -05:00
ZomgPonies
0f885c3afa Item attack logging was reversed 2013-12-15 05:07:09 -05:00
ZomgPonies
591cfd1394 Better logging 2013-12-15 03:15:40 -05:00
ZomgPonies
1d9537bbdc New click code 2013-10-12 14:43:56 -04:00