9d7c9714f3
Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin
2019-11-15 12:12:55 -05:00
581e7c7764
Reduce volume, reduce loop time
2019-11-13 05:31:33 -07:00
a45472b446
Update Chat System to use to_chat(src, "") instead of src << ""
2019-11-05 19:22:38 -05:00
ae859c49e9
[READY] Recolourable energy weapons. ( #6507 )
2019-11-01 12:38:06 -04:00
c177796c2d
Add Sounds to stuff! (Port from VOREStation)
2019-10-29 17:32:08 -04:00
a3fb3e3950
Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin
2019-10-29 09:33:48 +10:00
54aeb32617
Merge pull request #6091 from Novacat/nova-ert
...
Uplink additions
2019-10-21 21:01:06 -04:00
7dd592aa05
Uplink additions
...
Adds a few tools and medicines to uplinks. Also includes some polaris-side radio tweaks since I forgot I had it on this branch.
2019-10-21 18:57:44 -04:00
169d8acedd
Medical Expansion
2019-10-19 23:28:38 -04:00
3e31046aef
Fixes file discrepancy for autolathe ammo recipies
2019-10-14 05:35:30 +10:00
dade2aa80b
Conflict Resolution
2019-10-06 13:12:11 -04:00
b41963d179
Adds vorestation wallconsoles to autolathe
2019-09-24 19:02:05 +10:00
f3654d1b79
Amends name of outfits
2019-09-19 20:58:10 -06:00
c9e6a417f3
Adds Waiter/Waitress
2019-09-19 20:45:13 -06:00
305e79db40
Merge pull request #5834 from Novacat/nova-heterochromia
...
Cargo hardsuit changes
2019-09-14 00:39:23 -04:00
6f5daa6186
Cargo hardsuit changes
...
- Adds new empty hardsuits to cargo.
- Splits the mining vendor Industrial suit from the cargo ordered one
2019-09-09 09:55:00 -04:00
a1a395a1a9
Implements borg spawners
2019-09-06 16:27:51 +10:00
e34091d1ad
Ports 6440 early
...
Also moves some new security crate datums to its proper place
2019-09-03 18:22:32 -04:00
8259c32997
Merge pull request #5776 from MrSign/securitycargoimplant
...
Added tracking + chemical implants to orderable security crate(s)
2019-09-03 18:13:06 -04:00
b751e0e8bd
Updates paths due to Polaris change
2019-09-01 18:24:35 -04:00
f095ef0f0f
Merge branch 'master' into securitycargoimplant
2019-09-01 07:27:56 -04:00
de4e350a36
Update security.dm
2019-09-01 21:21:27 +10:00
0d73c8ad76
Early Polaris Ports
...
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434
No vorestation edit markings because they are polariscode ports.
2019-08-30 23:55:58 -04:00
4bccbedc91
Minor Fixes
...
- Brings pizza back at 50 points which it was supposed to be.
2019-08-24 18:26:50 -04:00
06fcadf97f
Merge pull request #5688 from VOREStation/upstream-merge-6396
...
[MIRROR] Chemistry Expansion
2019-08-21 18:01:11 -04:00
8f067fe785
Chemistry Expansion
2019-08-21 17:43:01 -04:00
caa612e264
Uniform Adjustments Phase 1
2019-08-21 17:26:28 -04:00
99d9653902
Merge branch 'master' into Toricrates-Remastered
2019-08-19 16:56:12 -04:00
3a676ad02e
Adds Toricrates and stuff
2019-08-15 22:22:28 +08:00
41497775aa
Adds a compact defibrillator crate
...
Mostly a solution if there are a lot of EMTs/Field Medics on shift, so there is less necessity to fight over the single compact defibrillator
2019-08-06 21:01:49 -04:00
32d5efa915
Fixes Subtle Teleporter
...
Fixes a problem with the subtle teleporter not working outside of station Z Levels.
2019-08-04 13:46:38 -04:00
8f00834eb8
Merge pull request #5526 from VOREStation/upstream-merge-6324
...
[MIRROR] Adds Laser Tag Turrets Plus Changes
2019-07-27 16:26:30 -04:00
69ed422019
Adds Laser Tag Turrets Plus Changes ( #6324 )
...
* Adds Laser Tag Turrets
* Adds changelog
* Reverts Lethal Turrets Shooting to Kill
* Small No Longer Means Misc Life
* Revert "Merge branch 'master' into Turret"
This reverts commit 0300e6723b1aec0c47f8f82f7db770aa29af2483, reversing
changes made to 219348783d49b3205c3ed64bdd604f61791e6e72.
* Revert "Revert "Merge branch 'master' into Turret""
This reverts commit ca3d13b3372f2c5587d8d2cc449a6da8503494e4.
* Github why
* Change laser.dm to master?
* Revert "Change laser.dm to master?"
This reverts commit da562f6bc1ec43fe0cf5fe6ec5af61ada3474dd9.
2019-07-27 15:45:58 -04:00
b30f9ffd0f
Adds Specialized SMES Coils to Suppy Console ( #6329 )
...
* Adds Specialized SMES Coils to Suppy Console
The capacitance and transmission coils are order-able for 90 points in the engineering section. (Standard coil is 75)
* Adds changelog
2019-07-27 13:11:34 -04:00
e4aae2a5a3
Fixes hardsuit crates not using one_access
2019-07-24 04:58:59 +10:00
54966826af
Merge pull request #6320 from Nalarac/Autolathe
...
Allows Multiple Light Printing in Autolathe
2019-07-22 00:44:30 -04:00
3d3452bdca
Ups point cost of pizza
2019-07-05 20:24:41 -04:00
3d31a77514
Multi-Tile Objects, Multi-Tile Hovershuttle
2019-07-01 20:43:53 -04:00
c11a1fc16e
Fixes spawning of action figures in crates.
2019-07-01 06:49:27 +10:00
ce70e5b3a2
Merge pull request #5395 from VOREStation/upstream-merge-6194
...
[MIRROR] Adds two new Cargo crates!
2019-06-30 01:59:45 -04:00
be853c735b
Update security.dm
2019-06-29 22:38:46 -04:00
c406672c26
Adds two new Cargo crates!
2019-06-29 19:46:41 -04:00
3da73d53f3
Merge pull request #6244 from Heroman3003/cargofix
...
Fixes glucose crate spawning
2019-06-29 19:26:57 -04:00
180d8e8df0
Standartizes _vr container definitions
2019-06-29 04:17:59 +10:00
cbb37fdeb1
One more forgotten exception
2019-06-28 17:13:42 +10:00
a16fcd2ae5
Fixes quantum pad and telepad teleportations
2019-06-28 05:51:05 +10:00
711e807d32
tinytweaks
2019-06-21 17:07:51 -04:00
21244ade2f
Merge pull request #6204 from Ketrai/worms
...
Adds worms
2019-06-11 17:35:11 -04:00
8e215ec10f
Allows supplypacks with req_one_access to exist
2019-06-04 13:15:14 -04:00
1ddecf112e
Merge pull request #5292 from Ketrai/fishbranch
...
Adds lobsters and cuttlefish
2019-06-03 21:06:22 -04:00
Unknown