PsiOmega 0f8156e77e Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm

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

..

crates_lockers

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

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

stool_bed_chair_nest

Removed attack_paw, attack_animal and attack_slime.

2014-11-13 17:15:29 +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

Adding shower curtains to the various station showers because.. well, it's nice.

2014-08-29 11:08:22 +02:00

displaycase.dm

Removed attack_paw, attack_animal and attack_slime.

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

door_assembly.dm

Merge resolution, compile fixes with outdated glass paths/map.

2014-11-19 23:17:25 +10:30

electricchair.dm

…

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

Refactored material definitions a little bit, removed all bananium from the codebase.

2014-06-08 00:40:34 +09:30

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

All the relevant examine changes.

2014-11-05 12:44:23 +01: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

Update lattice.dm

2014-01-18 00:16:14 +01:00

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

Merge resolution.

2014-11-19 23:19:33 +10:30

musician.dm

3d Sound from /tg/

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

noticeboard.dm

…

safe.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00

signs.dm

Grammar patch 1

2014-04-08 14:48:31 +03:00

tables_racks.dm

Fixes #6660

2014-11-01 21:38:04 -04:00

tank_dispenser.dm

Fixes #6644

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

target_stake.dm

Replaces get_turf_loc() with get_turf()

2014-06-10 13:43:11 -04:00

transit_tubes.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

watercloset.dm

Merg resolution.

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

windoor_assembly.dm

Fixes bubble/hull shield generators not updating air zones, update_nearby_tiles() cleanup.

2014-11-28 19:37:31 -05:00

window.dm

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

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