kevinz000 de0131346a Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items ...

# Conflicts:
#	code/controllers/configuration.dm
#	code/game/objects/items.dm

2017-05-21 18:17:42 -07:00

..

beds_chairs

[MIRROR] Harvesters are more fun to play (#894)

2017-05-18 07:12:29 -05:00

crates_lockers

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

transit_tubes

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

ai_core.dm

Unorphans the blackbox

2017-04-26 17:05:23 -05:00

aliens.dm

Fixes alien eggs

2017-05-03 22:22:26 -05:00

artstuff.dm

…

barsigns.dm

…

bedsheet_bin.dm

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

destructible_structures.dm

…

displaycase.dm

[MIRROR] Fixes language code ignoring holder restrictions (#858)

2017-05-18 04:13:57 -05:00

divine.dm

…

door_assembly.dm

…

dresser.dm

[MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876)

2017-05-18 06:51:26 -05:00

electricchair.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

extinguisher.dm

…

false_walls.dm

Changes a bunch of hrefs to the proper defines

2017-05-02 02:20:07 -05:00

fireaxe.dm

Changes some << to to_chat

2017-04-28 06:14:47 -05:00

fireplace.dm

…

flora.dm

New Tree Sprites

2017-05-04 17:58:58 -05:00

fluff.dm

…

ghost_role_spawners.dm

Fix choice for golems transferring between shells

2017-05-19 06:21:10 -05:00

girders.dm

[MIRROR] Harvesters are more fun to play (#894)

2017-05-18 07:12:29 -05:00

grille.dm

…

guncase.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

hivebot.dm

…

holosign.dm

…

janicart.dm

…

kitchen_spike.dm

…

ladders.dm

Initialize Refactor

2017-04-26 16:03:17 -05:00

lattice.dm

…

life_candle.dm

…

memorial.dm

…

mineral_doors.dm

Merge remote-tracking branch 'refs/remotes/origin/master' into custom_roundstart_items

2017-05-21 18:17:42 -07:00

mirror.dm

…

mop_bucket.dm

…

morgue.dm

[MIRROR] Minor refactors (#515)

2017-04-26 11:13:41 -05:00

musician.dm

…

noticeboard.dm

…

petrified_statue.dm

…

plasticflaps.dm

…

reflector.dm

…

safe.dm

…

showcase.dm

…

signs.dm

…

spirit_board.dm

…

statues.dm

Changes a bunch of hrefs to the proper defines

2017-05-02 02:20:07 -05:00

table_frames.dm

[MIRROR] Harvesters are more fun to play (#894)

2017-05-18 07:12:29 -05:00

tables_racks.dm

[MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916)

2017-05-18 09:37:30 -05:00

tank_dispenser.dm

…

target_stake.dm

…

traps.dm

Nerfs and buffs The Traps

2017-04-28 21:03:57 -05:00

watercloset.dm

Replaces /image with /mutable_appearance (#556)

2017-04-26 08:18:35 -05:00

windoor_assembly.dm

…

window.dm

Fixes clicking things under windows/doors.

2017-05-18 16:37:50 -05:00