Markolie 3b1dc8e487 Merge branch 'master' of https://github.com/ZomgPonies/Paradise ...

Conflicts:
	icons/obj/weapons.dmi
	maps/cyberiad.dmm

2014-11-27 21:39:01 +01:00

..

crates_lockers

Bug fixes, implements new copying/faxing system from Bay

2014-11-27 21:00:58 +01:00

stool_bed_chair_nest

More burnable shit

2014-07-24 21:07:32 -04:00

transit_tubes

Bug fixes, implements new copying/faxing system from Bay

2014-11-27 21:00:58 +01:00

barsign.dm

…

bedsheet_bin.dm

…

coathanger.dm

…

displaycase.dm

Constructable Phazon, constructable display case

2014-11-22 05:15:44 +01:00

door_assembly.dm

…

electricchair.dm

…

engicart.dm

Fixes and Stuff

2014-11-11 22:48:08 -05:00

extinguisher.dm

…

false_walls.dm

Recoded wall-smoothing for optimization. Fixes #835.

2014-07-25 16:29:00 -04:00

flora.dm

…

fullwindow.dm

Windows can now be disassembled

2014-08-10 21:51:06 +02:00

girders.dm

…

grille.dm

Melee attack for mechs

2014-11-22 06:05:13 +01:00

inflatable.dm

Slime update

2014-07-15 00:50:41 -04:00

janicart.dm

Projectile Laser Update

2014-11-26 19:16:21 -05:00

kitchen_spike.dm

…

ladders.dm

…

lamarr_cage.dm

…

lattice.dm

…

mineral_doors.dm

Fixes FEA temperature_expose() being used...

2014-06-22 02:03:42 -04:00

mirror.dm

Slime update

2014-07-15 00:50:41 -04:00

mop_bucket.dm

…

morgue.dm

Final Nations patch before live testing. This is going to be painful.

2014-05-27 20:09:10 -04:00

musician.dm

Music Updates

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

noticeboard.dm

…

safe.dm

Revert "Fix safe...?"

2014-06-16 22:03:03 -04:00

segway.dm

…

signs.dm

Completed adding Kidan Ambassador decorations

2014-07-23 13:24:51 -04:00

tables_racks.dm

Poker table fix, two handed fix, Nukeops naming

2014-11-09 21:37:14 -05:00

tables_racks.dm.bak

…

tank_dispenser.dm

…

target_stake.dm

…

watercloset.dm

…

windoor_assembly.dm

Windoor damage fix, allows deconstruction of windoors

2014-11-22 06:48:51 +01:00

window.dm

Melee attack for mechs

2014-11-22 06:05:13 +01:00