mwerezak 229f4cb043 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color ...

Conflicts:
	code/modules/customitems/item_defines.dm

2015-04-26 02:04:59 -04:00

..

crates_lockers

Map fixes.

2015-04-13 08:44:13 +02:00

stool_bed_chair_nest

Ports /vg/'s Nas-Sie remake.

2015-04-11 13:58:08 +02:00

barsign.dm

Adds 9 new bar signs.

2015-04-24 17:35:07 +03:00

bedsheet_bin.dm

Removes most instances of item_color

2015-04-22 17:40:27 -04:00

coathanger.dm

Fixes #8696

2015-03-31 20:30:06 -04:00

curtains.dm

Shower curtains no longer lose their default color upon being washed.

2015-04-20 14:42:43 +02:00

displaycase.dm

Fixes captain's laser gun

2015-02-25 23:35:20 -05:00

door_assembly.dm

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

electricchair.dm

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

extinguisher.dm

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

2015-03-31 02:13:22 -04:00

false_walls.dm

…

flora.dm

…

girders.dm

Borg module fixes

2015-04-10 09:50:47 +03:00

grille.dm

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

inflatable.dm

Updates storage costs

2015-03-05 10:40:25 -05:00

janicart.dm

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

kitchen_spike.dm

Finalized monkey species definitions and icons.

2015-03-26 14:45:41 +10:30

ladders.dm

…

lamarr_cage.dm

…

lattice.dm

…

mineral_doors.dm

Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.

2015-03-11 21:17:51 +10:30

mirror.dm

Merge resolution.

2015-04-11 13:23:17 +09:30

mop_bucket.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

morgue.dm

sanitize() refactor: fourth pass

2015-04-03 00:40:57 +03:00

musician.dm

…

noticeboard.dm

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

safe.dm

Accessories update.

2015-02-08 12:35:50 +03:00

signs.dm

…

tables_racks.dm

Fixes #8696

2015-03-31 20:30:06 -04:00

tank_dispenser.dm

…

target_stake.dm

Removes unnecessary and cruft procs from mob/inventory.dm

2015-03-30 05:28:09 -04:00

transit_tubes.dm

Partial breathing refactor

2015-03-09 00:09:34 -04:00

under_wardrobe.dm

Attempts to fix persistent station alarms. Makes wardrobes solid.

2015-03-09 20:55:05 +01:00

watercloset.dm

Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.

2015-03-28 11:01:11 +10:30

windoor_assembly.dm

…

window.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00