Repede e4dd365fe1 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Conflicts:
#	code/_helpers/unsorted.dm
#	code/controllers/subsystems/mapping_vr.dm
#	code/datums/datum.dm
#	code/datums/datumvars.dm
#	code/datums/supplypacks/voidsuits.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/objects/items/devices/defib.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/world.dm
#	code/modules/client/preference_setup/loadout/loadout_accessories.dm
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm
#	code/modules/client/preference_setup/loadout/loadout_head.dm
#	code/modules/client/preference_setup/loadout/loadout_suit.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/food/food/snacks.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	code/world.dm
#	config/custom_items.txt
#	config/example/config.txt
#	config/example/game_options.txt
#	icons/mob/robots.dmi
#	icons/obj/mining.dmi
#	maps/submaps/surface_submaps/wilderness/wilderness.dm
#	vorestation.dme

2019-04-07 19:40:12 -04:00

..

crates_lockers

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2019-04-07 19:40:12 -04:00

flora

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2019-04-07 19:40:12 -04:00

ghost_pods

Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding

2019-03-26 13:21:08 -04:00

props

Explorer Update - Cataloguers

2019-03-30 16:19:24 -04:00

stool_bed_chair_nest

Explorer Update - Cataloguers

2019-03-30 16:19:24 -04:00

barsign.dm

…

bedsheet_bin.dm

POLARIS: Fix cutting of bedsheets while holding them.

2018-04-19 20:51:25 -04:00

bonfire.dm

Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer

2019-03-26 23:58:26 -04:00

catwalk.dm

Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding

2019-03-26 13:21:08 -04:00

cliff.dm

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

coathanger.dm

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

curtains.dm

Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format

2018-08-02 21:45:15 -05:00

displaycase.dm

…

dogbed.dm

…

door_assembly.dm

Hopefully fixes some tool-conversion things

2018-08-03 15:13:29 -05:00

electricchair.dm

Standardizes rotation verbs

2019-03-27 03:17:07 -04:00

extinguisher.dm

Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format

2018-08-02 21:45:15 -05:00

fence.dm

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

fitness.dm

Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format

2018-08-02 21:45:15 -05:00

flora_vr.dm

…

flora.dm

Explorer Update - Cataloguers

2019-03-30 16:19:24 -04:00

girders.dm

Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it

2019-03-27 14:49:30 -04:00

gravemarker.dm

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

grille.dm

Items are now assumed to be conductive, rather than the opposite

2019-03-28 21:45:38 -04:00

holoplant.dm

Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding

2019-03-26 13:21:08 -04:00

inflatable.dm

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

janicart.dm

REVERT of nanoui/chemistry becoming subsystems (temp)

2019-04-05 13:30:32 +10:00

kitchen_spike.dm

…

lattice.dm

Items are now assumed to be conductive, rather than the opposite

2019-03-28 21:45:38 -04:00

lightpost.dm

Merge pull request #5792 from Neerti/christmas_stuff

2019-03-27 03:13:15 -04:00

loot_piles.dm

Adds the Zaddat Race + Modifies pressure damage calculations

2019-03-28 16:54:32 -04:00

map_blocker_vr.dm

Sorts out this PR

2019-03-26 21:43:56 -04:00

mirror.dm

Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format

2018-08-02 21:45:15 -05:00

mop_bucket.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

morgue_vr.dm

VS: Consistent logging changes to match polaris commit

2018-03-10 17:18:09 -05:00

morgue.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018

2018-05-25 13:23:47 -04:00

musician.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2019-04-07 19:40:12 -04:00

new_signs.dm

…

noticeboard.dm

Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding

2019-03-26 13:21:08 -04:00

plasticflaps.dm

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

railing.dm

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

safe.dm

Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding

2019-03-26 13:21:08 -04:00

signs.dm

Adds New PoI Features + Bonus PoI

2019-03-27 12:15:50 -04:00

simple_doors.dm

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

snowman.dm

…

stasis_cage.dm

Ports Stasis Cages from Baystation (#6017)

2019-03-30 14:55:52 -04:00

tank_dispenser.dm

Converts most istype(thing,tool) procs into an appropriate thing.is_tool() format

2018-08-02 21:45:15 -05:00

target_stake.dm

Items are now assumed to be conductive, rather than the opposite

2019-03-28 21:45:38 -04:00

transit_tubes.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

trash_pile.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2019-04-07 19:40:12 -04:00

under_wardrobe.dm

…

watercloset.dm

Adds Various Sounds, Looping Sound System

2019-03-27 03:55:21 -04:00

windoor_assembly.dm

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

window_spawner.dm

Rewrites Atmospherics

2019-03-28 19:25:11 -04:00

window.dm

Merge pull request #4848 from VOREStation/upstream-merge-5996

2019-03-28 22:01:16 -04:00