GinjaNinja32 681a6d21ea Merge remote-tracking branch 'upstream/dev' into ! ...

Conflicts:
	code/modules/mob/hear_say.dm

2014-12-08 15:32:49 +00:00

..

crates_lockers

Noise emotes

2014-12-07 12:09:02 +00:00

stool_bed_chair_nest

Merge resolution.

2014-12-08 13:01:04 +10:30

barsign.dm

Let's actually use these barsign sprites.

2014-10-20 23:58:26 +01:00

bedsheet_bin.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

coathanger.dm

All coats that can be buttoned are now subtypes of /obj/item/clothing/suit/storage/toggle

2014-11-11 11:27:11 -05:00

curtains.dm

…

displaycase.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

door_assembly.dm

Cleans up airlock electronics

2014-12-04 16:40:27 -05:00

electricchair.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

extinguisher.dm

Fix most nullspace items, rewrite floor tiles not to del() on every place/remove

2014-11-24 17:05:46 +00:00

false_walls.dm

…

flora.dm

…

girders.dm

Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything.

2014-11-13 21:41:02 +10:30

grille.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into powernet-sensors-mk2

2014-11-20 10:55:33 +01:00

inflatable.dm

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

2014-11-29 10:09:03 +01:00

janicart.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

kitchen_spike.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

ladders.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

lamarr_cage.dm

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +10:30

lattice.dm

…

mineral_doors.dm

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

2014-11-29 10:09:03 +01:00

mirror.dm

Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything.

2014-11-13 21:41:02 +10:30

mop_bucket.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

morgue.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

musician.dm

…

noticeboard.dm

…

safe.dm

…

signs.dm

…

tables_racks.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

tank_dispenser.dm

Fixes #6644

2014-10-11 07:44:48 +10:30

target_stake.dm

…

transit_tubes.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

watercloset.dm

Merg resolution.

2014-10-02 02:33:06 +09:30

windoor_assembly.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00

window.dm

Merge resolution.

2014-12-08 13:01:04 +10:30