Mervill c2e2440953 Merge branch 'master' into w_class ...

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

2016-12-02 21:44:24 -08:00

..

camera

…

dead

Replaces "specflags" with "species_traits" (#21851)

2016-12-01 21:16:33 +13:00

living

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

new_player

Adds a new beard style. Broken Man. (#21625)

2016-11-20 14:55:00 +13:00

death.dm

…

interactive.dm

Make energy guns able to use burst fire. (#21005)

2016-11-02 16:16:21 +13:00

inventory.dm

Wooweee feeling rustled today

2016-11-13 12:07:04 -05:00

login.dm

[READY]] FLIGHTPACKS (AKA cooler, better, and technological wings with a unique gimmick!) (#20860)

2016-11-25 13:26:43 +13:00

logout.dm

Removes needless check.

2016-11-10 01:33:05 -02:00

mob_cleanup.dm

…

mob_defines.dm

[READY]] FLIGHTPACKS (AKA cooler, better, and technological wings with a unique gimmick!) (#20860)

2016-11-25 13:26:43 +13:00

mob_helpers.dm

[READY]] FLIGHTPACKS (AKA cooler, better, and technological wings with a unique gimmick!) (#20860)

2016-11-25 13:26:43 +13:00

mob_movement.dm

Improves Geis binding resist (#21846)

2016-12-02 12:56:31 +01:00

mob_transformation_simple.dm

More istypes replaced with helpers (#20767)

2016-10-03 13:40:13 +13:00

mob.dm

Improves Geis binding resist (#21846)

2016-12-02 12:56:31 +01:00

say_readme.dm

…

say.dm

[S] Fixes deadchat bugs (#19972)

2016-08-19 17:06:08 -05:00

status_procs.dm

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

transform_procs.dm

Moves bodybag closet into the closet folder where they should be.

2016-11-05 00:00:28 +01:00

update_icons.dm

Neck Slots (#21169)

2016-10-26 19:03:41 +13:00