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

..

sorts

Conflict Resolution

2019-03-28 13:19:19 -04:00

_global_objects_vr.dm

Adds a way to set the tag of loadout collars as part of the loadout

2019-11-13 03:42:03 +00:00

_global_objects.dm

…

_lists.dm

Merge pull request #6169 from GeneriedJenelle/patch-1

2019-05-28 14:25:49 -04:00

atmospherics.dm

Merge pull request #6528 from Meghan-Rossi/atmosanalyzer

2019-11-19 14:31:00 -05:00

atom_movables.dm

Ports https://github.com/PolarisSS13/Polaris/pull/6146

2019-05-01 20:50:31 -04:00

events.dm

Merge pull request #5343 from ReddeyfishVor/slimeChanges

2018-06-11 14:11:28 -04:00

files.dm

Update Chat System to use to_chat(src, "") instead of src << ""

2019-11-05 19:22:38 -05:00

game.dm

Upgrades SDQL2 and refactors it to a datum

2019-03-27 11:50:49 -04:00

global_lists_vr.dm

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

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

global_lists.dm

Resolve conflicts, fix compile errors

2019-12-19 17:49:21 +00:00

icons_vr.dm

Tails/Taurs Hide Shoes & Clip Uniforms/Suits

2019-08-20 01:56:08 -04:00

icons.dm

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

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

logging_vr.dm

Implement rust-g library

2018-05-04 18:58:31 -04:00

logging.dm

Update logging.dm

2019-09-28 03:42:41 -04:00

matrices.dm

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

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

mobs.dm

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

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

names.dm

…

sanitize_values.dm

…

storage.dm

…

text_vr.dm

…

text.dm

Replaces lentext with length

2019-12-12 13:13:18 -05:00

time.dm

Conflict Resolution

2019-03-27 12:05:38 -04:00

turfs.dm

…

type2type_vr.dm

…

type2type.dm

Reminder: Yell at Leshana for not tagging edited code.

2019-03-27 20:03:23 -04:00

unsorted_vr.dm

Ban/unban, note/unnote, kick to webhook

2020-01-15 21:26:56 -05:00

unsorted.dm

Merge remote-tracking branch 'upstream/master'

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

view.dm

[READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work

2019-03-27 22:02:07 -04:00