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

# Conflicts:
#	code/modules/admin/verbs/adminhelp.dm
#	maps/virgo-1.dmm

2017-01-21 01:42:11 -05:00

..

autolathe

Added 357 stun to auto lathe and nudity permit coverage fix

2016-12-21 17:16:17 +01:00

helper_datums

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync

2016-06-07 18:37:47 -04:00

locations

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

observation

Ports event system from Bay

2016-06-01 22:05:04 +01:00

repositories

Camera fixes and performance tweaks.

2016-03-21 17:30:52 -04:00

supplypacks

Made a dmi and a dm file for the german uniforms and maybe russian ones in the future and fixed wedding rings coverage and added mateba and derringer to the crate

2016-12-30 12:14:27 +01:00

underwear

Ports a bunch of Baystation's underclothes and hair

2017-01-11 19:12:49 -06:00

uplink

AP bullets

2016-11-15 19:50:28 -06:00

vending

Vending machines now correctly throw products

2016-12-17 03:30:14 -05:00

wires

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

ai_law_sets.dm

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

ai_laws.dm

Fixes #10488.

2015-08-11 19:36:02 +02:00

browser.dm

Allow disabling styling of fake nanoui windows

2016-05-26 18:07:38 +01:00

category.dm

Underwear Datums (#1794)

2016-05-29 17:29:36 +01:00

computerfiles.dm

…

datacore.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

EPv2.dm

Adds Telecomms Logging to EPv2

2017-01-07 13:21:03 -05:00

hierarchy.dm

Rehauls some autolathe code

2016-07-24 22:02:58 +01:00

mind.dm

Ports event system from Bay

2016-06-01 22:05:04 +01:00

mixed.dm

Powernets

2014-09-07 01:10:22 -04:00

modules.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

organs.dm

Organs:

2011-10-08 10:38:01 +00:00

progressbar.dm

Can now toggle the progress bar visibility.

2016-03-30 00:13:41 +01:00

recipe.dm

Removes circuit boards from relevant checks for microwaves, cooking.

2016-05-05 01:24:38 -04:00

sun.dm

finishes work on adapting the goon process scheduler for BS12.

2015-03-04 05:14:36 -05:00

weakref.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00