Mloc-Hibernia 281a26b979 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

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

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm

2014-07-18 13:08:12 +00: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-freeze

2014-07-18 13:08:12 +00:00

random

Fixes #4721

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

structures

Thrown items can be targeted, has miss chance...

2014-07-15 01:14:04 -04:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

Fixes human internal organs list

2014-07-12 16:15:37 -04: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

…