Markolie 72db213067 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm

2015-02-22 19:12:11 +01:00

..

crates_lockers

Merge pull request #380 from Markolie/master

2015-02-22 08:30:11 -05:00

stool_bed_chair_nest

Merge with upstream/master

2015-02-18 13:41:32 -05:00

transit_tubes

Transit tube pressure fix

2014-12-22 20:31:03 +01:00

barsign.dm

…

bedsheet_bin.dm

…

coathanger.dm

…

curtains.dm

Curtains

2015-01-11 05:49:47 +01:00

displaycase.dm

Fixes

2015-01-15 19:42:15 -05:00

door_assembly.dm

…

dresser.dm

Fix dressers to actually work. [BUGFIX]

2015-02-13 23:04:04 +01:00

electricchair.dm

More verb fixes

2015-01-06 22:46:11 +01:00

engicart.dm

Food Cart Re-Sprite and Adjustments

2015-02-10 23:32:59 -05:00

extinguisher.dm

…

false_walls.dm

False rwalls now smooth with regular walls and vice versa

2015-02-12 23:37:54 +01:00

flora.dm

…

foodcart.dm

Food Cart Re-Sprite and Adjustments

2015-02-10 23:32:59 -05:00

fullwindow.dm

Add Smoothed Dark Windows, Ninja EMP Cost Increase

2015-01-19 15:16:09 -05:00

girders.dm

Revert "Revert "Saycode/language/species port from Bay""

2015-02-20 17:46:35 +01:00

grille.dm

Standardize mutations

2015-02-22 19:04:43 +01:00

inflatable.dm

Remove legacy viewpoint code, move back to Bay's and /tg/'s system

2015-02-10 17:02:27 +01:00

janicart.dm

Food Cart Re-Sprite and Adjustments

2015-02-10 23:32:59 -05:00

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

Xenos gamemode rework

2014-12-13 02:08:22 +01:00

lattice.dm

…

mineral_doors.dm

Remove legacy viewpoint code, move back to Bay's and /tg/'s system

2015-02-10 17:02:27 +01:00

mirror.dm

…

mop_bucket.dm

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

morgue.dm

Switch copytext and sanitize proc

2015-02-20 22:17:13 +01:00

musician.dm

Music Updates

2014-10-31 21:55:25 -04:00

noticeboard.dm

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

safe.dm

Accessory overhaul

2015-02-08 14:29:10 +01:00

segway.dm

…

signs.dm

…

tables_racks.dm

Standardize mutations

2015-02-22 19:04:43 +01:00

tables_racks.dm.bak

…

tank_dispenser.dm

…

target_stake.dm

…

watercloset.dm

…

windoor_assembly.dm

Remove legacy viewpoint code, move back to Bay's and /tg/'s system

2015-02-10 17:02:27 +01:00

window.dm

Standardize mutations

2015-02-22 19:04:43 +01:00