Anewbe 7bb3f5fbb7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things ...

# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm

2017-04-01 12:45:45 -05:00

..

crates_lockers

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things

2017-04-01 12:45:45 -05:00

stool_bed_chair_nest

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things

2017-04-01 12:45:45 -05:00

barsign.dm

Clears the appearance flag for multi-tile objects.

2016-09-25 19:40:11 +02:00

bedsheet_bin.dm

Pulling & Size Fixes

2016-09-24 16:18:32 -04:00

coathanger.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

curtains.dm

Merge pull request #1239 from Mark9013100/3/23/2016layering

2016-03-26 17:06:54 -04:00

displaycase.dm

Adds click cooldown to display case

2016-05-13 01:34:19 +01:00

door_assembly.dm

Continues work on the surface map

2017-03-21 16:11:13 -04:00

electricchair.dm

…

extinguisher.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

flora.dm

Merge pull request #3064 from Woodratt/WR_SC_Changes

2017-03-08 19:58:46 -06:00

girders.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

grille.dm

…

inflatable.dm

Added in-hand sprites to most item lacking them from the Medical department.

2017-03-26 07:04:01 +01:00

janicart.dm

Ports Bay's custodial bag tweaks

2017-01-14 23:44:16 -06:00

kitchen_spike.dm

Fixes #2012

2016-08-15 10:46:26 -04:00

lattice.dm

Adds Multi-Z Test Map

2017-03-03 09:40:34 -05:00

mirror.dm

Returns the Vox, who now breath Phoron

2017-01-06 17:49:39 -06:00

mop_bucket.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

morgue.dm

Morgue Trays interface with occupant minds

2016-04-25 20:10:43 +02:00

musician.dm

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

noticeboard.dm

Reverts the second mob clean up because of incomplete implementation.

2016-05-04 00:24:55 -04:00

safe.dm

Construction Update

2016-03-25 16:02:36 -04:00

signs.dm

WR_SC_Map_Changes

2017-03-08 17:44:48 -08:00

simple_doors.dm

…

tank_dispenser.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

target_stake.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

transit_tubes.dm

Ports Byond 510 preperations from Bay

2016-03-14 18:21:44 +00:00

under_wardrobe.dm

Adds a verb for toggling specific pieces of underwear

2016-08-12 20:58:40 +02:00

watercloset.dm

Toilet fixes

2017-02-28 01:52:57 -05:00

windoor_assembly.dm

Updates for Yosh's work

2016-11-20 16:56:12 -06:00

window_spawner.dm

…

window.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00