Repede b83e867682 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm

2018-06-02 18:33:44 -04:00

..

adminhelp.dm

Fixing html stripping

2018-03-24 17:39:19 -04:00

adminjump.dm

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

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

adminpm.dm

POLARIS: Clean up adminpm logs

2018-03-21 14:28:48 -04:00

adminsay.dm

POLARIS: Revamp logging to be consistent

2018-03-13 18:20:58 -04:00

antag-ooc.dm

POLARIS: Revamp logging to be consistent

2018-03-13 18:20:58 -04:00

atmosdebug.dm

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

BrokenInhands.dm

…

buildmode.dm

…

check_customitem_activity.dm

…

cinematic.dm

…

custom_event.dm

…

deadsay.dm

…

debug_vr.dm

Removes obsolete assistant ratio code, fixes nonconstant declaration

2018-01-29 01:22:41 -05:00

debug.dm

Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms

2018-05-28 15:55:55 -04:00

diagnostics.dm

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

dice.dm

…

getlogs.dm

POLARIS: Moves daily logs into being folders rather than files

2018-03-13 18:20:59 -04:00

grief_fixers.dm

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

map_template_loadverb.dm

POLARIS: Tweak map-loading in some ways

2018-02-03 22:30:24 -05:00

mapping.dm

Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms

2018-05-28 15:55:55 -04:00

massmodvar.dm

Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms

2018-05-28 15:55:55 -04:00

modifyvariables.dm

…

panicbunker.dm

Paranoid logging and byond account age

2018-05-22 23:03:53 -04:00

playsound.dm

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

2018-06-02 18:33:44 -04:00

possess.dm

U_I Phase 2.0: Code cleanup

2018-03-08 19:33:44 -05:00

pray.dm

Adds 'Smite' verb and pray response button

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

randomverbs.dm

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

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

SDQL_2_parser.dm

…

SDQL_2.dm

…

SDQL.dm

Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms

2018-05-28 15:55:55 -04:00

smite_vr.dm

Plane tweak for adminbuse

2018-05-25 12:48:30 -04:00

smite.dm

Switch to shocking head and electrocute_act

2018-05-24 00:57:26 -04:00

striketeam.dm

…

ticklag.dm

…

tripAI.dm

…