alberyk 4b32268c1a Merge branch 'master' into final_shuttle_touches_and_stuff ...

# Conflicts:
#	code/game/objects/structures/window.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm

2021-12-21 16:51:40 -03:00

..

crates_lockers

Merge branch 'master' into final_shuttle_touches_and_stuff

2021-12-21 16:51:40 -03:00

gore

You see me rollin' - Roller Bed Tweaks (#11150)

2021-02-16 19:41:55 +01:00

stool_bed_chair_nest

Merge branch 'master' into final_shuttle_touches_and_stuff

2021-12-21 16:51:40 -03:00

vr

Colorable Chairs, Stools, and other phoney baloney (#12797)

2021-12-02 22:57:24 +01:00

banner.dm

SCC Things (#11330)

2021-03-18 17:10:36 +01:00

barsign.dm

…

bedsheet_bin.dm

All jobs

2021-09-23 23:07:28 -03:00

coathanger.dm

adds epmc labcoat and taj cloak coatrack sprites (#12683)

2021-11-02 15:02:57 -03:00

crystals.dm

/decl/chem (#10538)

2021-01-17 00:11:28 +02:00

curtains.dm

Curtain and Flap material fix (#10997)

2021-01-23 21:32:36 +01:00

displaycase.dm

Display Case Update (#10993)

2021-01-23 23:00:15 +02:00

door_assembly.dm

Multi-tile Airlock Fixes | Airlock QoL (#12249)

2021-07-31 17:31:47 -03:00

extinguisher.dm

…

fireaxe_cabinet.dm

…

flora.dm

…

full_window_frame.dm

Adds new full windows (#12434)

2021-09-17 12:36:40 +02:00

girders.dm

Plasma Cutter Improvements (#11231)

2021-02-24 16:01:28 +01:00

grille.dm

Adds new full windows (#12434)

2021-09-17 12:36:40 +02:00

inflatable.dm

Inflatables Buff (#11537)

2021-04-22 12:02:11 +02:00

janicart.dm

/decl/chem (#10538)

2021-01-17 00:11:28 +02:00

kitchen_spike.dm

…

lattice.dm

…

mirror.dm

Reflective Mirrors (#11677)

2021-06-02 22:19:18 -03:00

mop_bucket.dm

Gardening and Janitor QoL Buff (#11947)

2021-05-26 12:47:56 +02:00

morgue.dm

Cremation animation + refactors and improvements (#10885)

2021-02-01 10:22:15 +01:00

musician.dm

Revert "New Check" (#11344)

2021-03-01 18:24:59 +01:00

noticeboard.dm

…

plasticflaps.dm

Grammar for Buckling (#11210)

2021-02-17 10:54:43 +01:00

railing.dm

fixes railing jumping (#12849)

2021-12-19 05:10:06 +01:00

safe.dm

Thermal Safe Drill (#10996)

2021-01-24 12:15:14 +01:00

sarcophagus.dm

…

signs.dm

Adds a Vysokan flag and banner (#12439)

2021-09-13 14:52:18 +02:00

simple_doors.dm

Reworks armor damage reduction + armor components + more goodies. (#11106)

2021-02-14 17:54:45 +02:00

tank_dispenser.dm

…

target_stake.dm

Shooting Target Refactor (#11186)

2021-04-06 23:13:08 -03:00

therapy.dm

Drowsiness Changes (#11996)

2021-06-24 21:48:15 -03:00

tranqcabinet.dm

…

transit_tubes.dm

…

trash_pile.dm

Siemens Checking (#11864)

2021-05-25 14:34:20 +02:00

under_wardrobe.dm

…

warp_drive.dm

…

watercloset.dm

Fix rags & ashtrays (#11610)

2021-04-07 16:26:42 +02:00

weapon_rack.dm

Fixes various items not initializing properly. (#11196)

2021-02-15 15:04:04 +01:00

windoor_assembly.dm

…

window.dm

Merge branch 'master' into final_shuttle_touches_and_stuff

2021-12-21 16:51:40 -03:00