Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

atmospherics.dm

Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases

2020-08-27 22:28:46 -04:00

contraband_vr.dm

Merge remote-tracking branch 'upstream/master'

2020-01-13 18:37:42 +00:00

contraband.dm

'Reverts' a bunch of changes that we've made through the years and see if any of those could have been the cause for out of memory errors to start appearing, unchecks a bunch of unused things like mining rewards and coin-shop as well as some admin systems that are not checked on upstream.

2020-07-26 12:48:22 -04:00

costumes_vr.dm

Merge pull request #8833 from VOREStation/upstream-merge-7456

2020-08-28 13:04:33 -04:00

costumes.dm

The great Aurora shoe heist

2020-08-25 19:17:10 -04:00

engineering_vr.dm

Add an Inducer crate to cargo. Relatively expensive at 90.

2020-08-30 21:40:09 +02:00

engineering.dm

Compatability fixes

2020-07-22 17:37:47 -04:00

hospitality_vr.dm

Minor Fixes

2019-08-24 18:26:50 -04:00

hospitality.dm

Merge pull request #7567 from lbnesquik/Kot-PIZZAFIX

2020-08-27 20:38:16 -04:00

hydroponics_vr.dm

Adds monkfish

2019-05-31 17:17:29 +02:00

hydroponics.dm

Flavour Enhancement: Crates

2020-07-21 22:20:30 -04:00

materials_yw.dm

more screaming

2020-07-04 04:03:19 -05:00

materials.dm

Flavour Enhancement: Crates

2020-07-21 22:20:30 -04:00

medical_ch.dm

Backup Implanter x4

2020-07-20 03:55:10 -05:00

medical_vr.dm

Overhauls First Aid Kits

2020-04-26 13:38:28 -04:00

medical.dm

Distillery Upkeep, Chemistry Tweakening (#7573)

2020-08-31 22:37:18 -04:00

misc_vr.dm

Actually put two in the crate.

2020-06-11 04:24:36 +02:00

misc_yw.dm

miscellaneous updates

2020-08-04 11:23:19 +01:00

misc.dm

added new plushies to drop lists

2020-09-19 03:03:09 -05:00

munitions_vr.dm

Gun Refactors and Changes

2020-04-11 19:39:49 -04:00

munitions.dm

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

2020-07-15 12:27:54 +02:00

recreation_vr.dm

Add Romantical Whale's "shiny" clothes

2020-08-27 18:08:36 -04:00

recreation_yw.dm

Adds purchaseable Piano crates to cargo

2020-04-23 00:28:03 -05:00

recreation.dm

Flavour Enhancement: Crates

2020-07-21 22:20:30 -04:00

robotics_vr.dm

Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018

2018-09-27 18:01:09 -04:00

robotics.dm

Flavour Enhancement: Crates

2020-07-21 22:20:30 -04:00

science_vr.dm

Fixes up science cargo packs, Oties disabled.

2019-02-18 10:42:23 +01:00

science.dm

Flavour Enhancement: Crates

2020-07-21 22:20:30 -04:00

security_vr.dm

Ports 6440 early

2019-09-03 18:22:32 -04:00

security_yw.dm

loyalty implant reimplementation

2020-03-16 18:22:49 +00:00

security.dm

Flavour Enhancement: Crates

2020-07-21 22:20:30 -04:00

supply_vr.dm

makes the cargo order plop out a filled machine.

2020-01-08 10:25:44 +01:00

supply.dm

Adds wearing cones and caution signs (#7466)

2020-08-17 12:59:40 -04:00

supplypacks.dm

Allows supplypacks with req_one_access to exist

2019-06-04 13:15:14 -04:00

voidsuits_vr.dm

Standartizes _vr container definitions

2019-06-29 04:17:59 +10:00

voidsuits.dm

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

2020-08-22 20:07:45 +02:00