KasparoVy 3e653a6279 Conflict resolution.

2016-09-26 12:17:35 -04:00

..

crates_lockers

added absolute paths

2016-09-03 09:15:30 +04:00

stool_bed_chair_nest

Merge conflicts begone

2016-08-01 18:28:47 -07:00

transit_tubes

Revert "Merge pull request #4739 from monster860/vg-parallax"

2016-07-28 15:48:27 -07:00

artstuff.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00

barsign.dm

Mass replace

2016-07-07 19:34:02 -07:00

bedsheet_bin.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00

coathanger.dm

Mass replace

2016-07-07 19:34:02 -07:00

curtains.dm

…

displaycase.dm

Mass replace

2016-07-07 19:34:02 -07:00

door_assembly.dm

Mass replace

2016-07-07 19:34:02 -07:00

dresser.dm

Sorts out some runtimes, adds randomization for a bunch more stuff in character preferences, adds species validation to undergarments, adds absolute pathing to sprite_accessories and repaths alot of stuff.

2016-08-27 09:22:01 -04:00

electricchair.dm

Field Generator Cleanup, Singularity Fixes,

2016-08-03 17:17:04 -04:00

engicart.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

extinguisher.dm

Mass replace

2016-07-07 19:34:02 -07:00

false_walls.dm

Redo of clown/mime door fix.

2016-09-12 20:11:54 +10:00

flora.dm

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

foodcart.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

fullwindow.dm

…

girders.dm

Makes girders non-bulletproof

2016-08-21 11:12:48 -04:00

grille.dm

Grille Inconsistency Fix

2016-07-08 03:29:16 -05:00

inflatable.dm

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

janicart.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

Mass replace

2016-07-07 19:34:02 -07:00

lattice.dm

Mass replace

2016-07-07 19:34:02 -07:00

mineral_doors.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00

mirror.dm

Mass replace

2016-07-07 19:34:02 -07:00

misc.dm

Makes boldnotice and danger classes be be used

2016-08-11 12:20:02 -04:00

mop_bucket.dm

Mass replace

2016-07-07 19:34:02 -07:00

morgue.dm

Fixes cremation of self-deleting mobs

2016-08-03 19:21:36 -04:00

musician.dm

Mass replace

2016-07-07 19:34:02 -07:00

noticeboard.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

safe.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

signs.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00

spirit_board.dm

…

statue.dm

…

tables_racks.dm

add_logs() un-fuckery

2016-08-29 17:27:56 -04:00

tank_dispenser.dm

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

target_stake.dm

…

watercloset.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00

windoor_assembly.dm

tweak

2016-07-26 14:02:07 -04:00

window.dm

Merge conflicts begone

2016-08-01 18:28:47 -07:00