mwerezak 11c5b10bb9 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.

Conflicts:
	code/game/objects/items/weapons/clown_items.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2016-04-22 04:57:22 -04:00

..

calamity

Revert 58ef59734f

2015-11-08 10:09:14 -05:00

changeling

Merge branch 'master' into cleanupTwo

2016-04-21 11:41:32 +03:00

cult

Refactors various item attack() implementations

2016-04-22 04:57:22 -04:00

endgame

Mob inventory cleanup

2016-03-24 01:23:08 +03:00

epidemic

Fixes some gamemode names

2016-04-09 20:02:56 +01:00

events

Removes unused code - old turrets

2016-02-25 15:08:30 +03:00

extended

…

heist

Fixes some gamemode names

2016-04-09 20:02:56 +01:00

malfunction

Fixes some gamemode names

2016-04-09 20:02:56 +01:00

meme

Revert 58ef59734f

2015-11-08 10:09:14 -05:00

meteor

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

mixed

Bumps up MercenaryRenegade gamemode requirement.

2016-04-19 13:05:05 -04:00

ninja

Fixes some gamemode names

2016-04-09 20:02:56 +01:00

nuclear

Fixes mercenaries not showing up at round-end.

2016-03-14 02:40:33 -04:00

revolution

Revolution now requires 15 people to start.

2016-02-24 11:50:20 -05:00

sandbox

Fixes some gamemode names

2016-04-09 20:02:56 +01:00

traitor

Adds lizard, visitors and intrigue game modes.

2016-03-16 11:11:44 -04:00

wizard

Alters the secret player requirements for various game modes:

2015-11-28 23:08:11 +00:00

events.dm

Merge branch 'master' into botFixes

2016-03-01 14:48:24 +03:00

game_mode_latespawn.dm

Gives mods AOOC, fixes AUTOAUTOTRAITOR.

2016-01-05 18:12:56 -05:00

game_mode.dm

Adjusts secret game mode possibility formatting

2016-04-04 19:22:03 +01:00

gameticker.dm

Adjusts secret game mode possibility formatting

2016-04-04 19:22:03 +01:00

newobjective.dm

…

objective.dm

Tweaks to previous commits.

2015-12-24 21:13:40 +10:30

setupgame.dm

…