phil235 56c853f9d6 Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1 ...

Conflicts:
	code/modules/mob/living/simple_animal/friendly/mouse.dm

2014-10-21 15:58:39 +02:00

..

crates_lockers

Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1

2014-10-21 15:58:39 +02:00

stool_bed_chair_nest

Merge pull request #5263 from Aranclanos/electropackrevamp

2014-10-16 08:08:57 -05:00

transit_tubes

Changed breakout times to use the new constants

2014-10-15 11:40:25 -03:00

bedsheet_bin.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor

2014-06-09 01:50:44 -07:00

displaycase.dm

Changes many span classes.

2014-10-18 16:00:38 +02:00

door_assembly.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

dresser.dm

general code optimizations

2014-10-08 10:10:03 -07:00

electricchair.dm

Removed on variable and toggle verb

2014-09-16 12:11:42 +02:00

extinguisher.dm

…

false_walls.dm

Fixes the dismantling falsewalls with plasmacutters, diamond drills or energy blades.

2014-09-12 06:44:25 -03:00

flora.dm

Small grammar fix.

2014-10-11 17:44:54 +02:00

girders.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix

2014-10-15 18:23:40 +02:00

grille.dm

Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere.

2014-10-15 18:03:06 +02:00

janicart.dm

Disregard that I suck cocks

2014-08-21 07:35:51 -07:00

kitchen_spike.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

ladders.dm

…

lamarr_cage.dm

Changes many span classes.

2014-10-18 16:00:38 +02:00

lattice.dm

Updated to resolve conflicts

2014-09-06 13:34:43 +04:00

mineral_doors.dm

Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere.

2014-10-15 18:03:06 +02:00

mirror.dm

…

mop_bucket.dm

Change examine() from an atom verb to a mob verb

2014-05-01 09:56:39 -07:00

morgue.dm

Removing many instances of the no longer used second argument of message_admins() proc.

2014-10-05 01:29:30 +02:00

musician.dm

Replacing some hearers(...) with get_hearers_in_view(...).

2014-09-25 18:22:27 +02:00

noticeboard.dm

…

OpTable.dm

…

safe.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck

2014-05-13 14:03:42 -05:00

signs.dm

More name fixing, lowercasing objects, proper-ing unique objects, plural-ing some stuff that needs it.

2014-05-01 23:07:35 +02:00

spirit_board.dm

Adds logging, fixes typo

2014-09-04 00:42:06 -05:00

statues.dm

Changes many span classes.

2014-10-18 16:00:38 +02:00

tables_racks.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix

2014-10-15 18:23:40 +02:00

tank_dispenser.dm

…

target_stake.dm

absolute paths for the structure folder files

2014-08-16 00:01:04 +02:00

watercloset.dm

Showers wet the floor.

2014-09-07 00:11:04 +03:00

windoor_assembly.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix

2014-10-15 18:23:40 +02:00

window.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix

2014-10-15 18:23:40 +02:00