6 Commits
Author SHA1 Message Date
SoundScopes 4090f46636 Merge branch 'master' into development
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/supermatter/supermatter.dm
2014-11-06 01:25:13 +00:00
skull132 3c04d7199d Bay Merge 05NOV2014
Known errors:

* A set of errors tied to updating the fire overlays.
* A single error related to a dischephency between new and old slime
code
* A set of errors related to the recharging of stun batons
* A single error due to old machinery code coming from your grav
generator file
* A single error error from your space cooler code, due to old
atmopsherics code
* A playerpanel warning
* An error tied to extinguishing and old atmos code.
2014-11-05 23:58:05 +02:00
SoundScopes d5568cd9fb Redundant code
from floating animations
2014-10-29 11:48:50 +00:00
SoundScopes 05133fe591 Floating Fix
Buckled mobs no longer float.
2014-08-29 19:03:45 +01:00
im8lol e52a64e241 firing_range_executions
-target_stake.dm now allows mobs to be buckled on to it

-mob.dm has had a line added to tell the target stake that we want it to
buckle the mob like a chair (Don't know why they made this here)

-fancy.dm cigarette packs now can hold pills and lighters

-boxes.dm added last request box and transplant storage box. Transplant
storage box is part of a WIP
2014-05-16 15:49:23 -04:00
skull132 a8d9450c7e Initial Commit 2014-03-11 09:03:52 +02:00