izac112 933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update ...

# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved

2020-01-31 18:23:50 +01:00

..

crates_lockers

Merge branch 'master' into master

2020-01-13 20:31:39 +00:00

flora

Merge remote-tracking branch 'upstream/master'

2019-08-22 21:32:01 +01:00

ghost_pods

Also buffs vore laws chance for lost voreborgs

2020-01-13 17:55:00 +10:00

props

GameMaster Tuning (#6593)

2020-01-05 01:39:28 -05:00

stool_bed_chair_nest

Ports Sofas from CitRP

2019-09-10 00:15:07 -05:00

barsign.dm

…

bedsheet_bin.dm

…

bonfire.dm

…

catwalk.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin

2019-10-29 09:33:48 +10:00

cliff.dm

…

coathanger.dm

…

curtains.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update

2020-01-31 18:23:50 +01:00

displaycase.dm

…

dogbed.dm

…

door_assembly.dm

…

electricchair.dm

…

extinguisher.dm

…

fence.dm

…

fireaxe.dm

Fixes fireaxe cabinets

2019-04-16 22:00:42 -04:00

fitness.dm

…

flora_vr.dm

…

flora.dm

Exploration Expansion 1: Or, How I Learned To Love The Tree

2019-08-21 17:23:07 -04:00

girders.dm

Xenowork Prep For Future (#6491)

2019-11-04 21:38:02 -05:00

gravemarker.dm

…

grille.dm

Combat Mechs Can Punch More Things (#6303)

2019-07-24 17:00:24 -04:00

handrail_vr.dm

Final touches

2019-08-15 23:18:05 -04:00

holoplant.dm

…

inflatable.dm

Combat Mechs Can Punch More Things (#6303)

2019-07-24 17:00:24 -04:00

janicart.dm

Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"

2019-04-08 15:24:27 -04:00

kitchen_spike.dm

…

lattice.dm

…

ledges.dm

The great rock update.

2019-07-13 18:21:45 -04:00

lightpost.dm

…

loot_piles.dm

Fixes mech projectile armor thinking test projectiles are dangerous

2019-12-21 23:58:07 -05:00

map_blocker_vr.dm

…

mirror.dm

Change various global species lists to GLOB versions, adds 2 more event subspecies.

2019-12-16 00:52:29 -05:00

mop_bucket.dm

…

morgue_vr.dm

…

morgue.dm

…

musician.dm

Merge remote-tracking branch 'upstream/master'

2019-12-21 21:57:49 +00:00

new_signs.dm

…

noticeboard.dm

…

plasticflaps.dm

Merge pull request #6404 from Heroman3003/flappening

2019-09-22 19:53:30 -04:00

railing.dm

Combat Mechs Can Punch More Things (#6303)

2019-07-24 17:00:24 -04:00

safe.dm

…

signs.dm

Makes placeholder entries for lore writing

2019-04-23 11:13:42 +10:00

simple_doors.dm

Blind port of Bay Radiation Subsystem

2019-10-06 03:30:36 -04:00

snowman.dm

…

stasis_cage.dm

Makes stasis cages use the new sprites

2019-09-28 22:01:11 +03:00

tank_dispenser.dm

…

target_stake.dm

…

transit_tubes.dm

…

trash_pile.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update

2020-01-31 18:23:50 +01:00

under_wardrobe.dm

…

watercloset.dm

…

windoor_assembly.dm

…

window_spawner.dm

…

window.dm

Combat Mechs Can Punch More Things (#6303)

2019-07-24 17:00:24 -04:00