Mloc-Argent 64d2a69a32 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm

2014-07-06 17:50:53 +01:00

..

closets

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron

2014-04-16 21:44:26 -07:00

effects

Stops buckled mobs from slipping (for now)

2014-07-02 22:36:49 +02:00

items

Merge remote-tracking branch 'upstream/master' into dev

2014-07-06 17:50:53 +01:00

random

Fixes #4721

2014-04-12 13:06:10 +03:00

structures

Merge remote-tracking branch 'upstream/master' into dev

2014-07-06 17:50:53 +01:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

3d Sound from /tg/

2014-03-27 14:49:49 -04:00

items.dm

Merge pull request #4968 from MrLeebo/mutiny

2014-05-28 00:13:42 -05:00

objs.dm

rework talking items and re-enable them, made xenoarch boxes have a variable internal size, added three new eldritch xenoarch finds (poltergeist mask, vampiric statuette, endless replenishing container)

2014-06-20 18:42:25 +10:00

structures.dm

Fucking Hell I'm an idiot.

2014-07-03 05:10:31 +09:30

weapons.dm

…