Commit Graph

5 Commits

Author SHA1 Message Date
Markolie
b4db3ca710 Inflatable wall box change 2014-12-14 01:02:51 +01: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
mwerezak
4a2993b20b Separates the sharp flag into edge and sharp
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.

Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/reagent_containers/syringes.dm
	code/modules/surgery/eye.dm
2014-06-17 06:51:51 -04:00
RavingManiac
9bfd6f56ba Inflatable barrier boxes readded to engineering. Inflatable barriers can no longer be deflated by ghosts.
Conflicts:
	maps/tgstation2.dmm
2014-04-28 18:47:15 -04:00
RavingManiac
f80d1e702b Missing files added. 2014-04-19 15:51:27 -04:00