Heroman3003
5f05d26eb9
Merge branch 'master' into resleeving_sickness
2020-01-10 09:43:42 +10:00
Atermonera
f67866957f
Merge pull request #6602 from Heroman3003/legcuffening
...
Makes legcuffs printable in hacked autolathe
2020-01-08 13:48:55 -05:00
ketraiski
b714419bf3
makes the cargo order plop out a filled machine.
2020-01-08 10:25:44 +01:00
Ketrai
9112a9a2b6
Food cubes
...
woop
removes a line of unneeded code
2020-01-07 22:51:12 +01:00
Heroman
2b10027024
Makes the sickness affect only people dying via non-vore deaths, adds fluff version with no downsides
2020-01-07 17:02:39 +10:00
Heroman
387fa7e898
Adjusts Eradicator law 3 wording
2020-01-03 12:44:56 +10:00
Heroman
1d6a57bbfd
Typos and slight rewordings
2020-01-03 07:46:01 +10:00
Novacat
3ef9dd9b28
Merge pull request #6362 from Ketrai/superqualityforbartenders
...
makes glasses mass producable
2019-12-31 10:22:24 -05:00
Heroman
d359362536
Adds some vorish lawsets
2019-12-29 12:15:29 +10:00
Atermonera
45b4947d1e
Merge pull request #6584 from TheFurryFeline/TFF-Print_Da_Sprayers
...
Printable Spray Bottles
2019-12-25 18:10:16 -05:00
Ketrai
e6021d108d
makes glasses mass producable
2019-12-22 21:15:29 +01:00
Meghan-Rossi
f59e2811e3
Merge branch 'upstream-merge-6520' into prybars
2019-12-19 18:47:49 +00:00
Atermonera
ef75d1c2a0
Clean up dead code obsoleted by outfit system
2019-12-16 00:51:16 -05:00
saysage
c6bed66e10
Two new undershirts ( #6556 )
...
* Add files via upload
* Add files via upload
2019-12-14 04:04:15 -05:00
Novacat
acf72f115a
Update security.dm
2019-11-24 17:27:22 -05:00
Mechoid
99bc3dcdbc
Security / PseudoCargo Expansion
2019-11-24 17:23:48 -05:00
Unknown
9d7c9714f3
Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin
2019-11-15 12:12:55 -05:00
Rykka
581e7c7764
Reduce volume, reduce loop time
2019-11-13 05:31:33 -07:00
Atermonera
a45472b446
Update Chat System to use to_chat(src, "") instead of src << ""
2019-11-05 19:22:38 -05:00
Meghan-Rossi
17f59d539a
Fix some people spawing without prybars
...
Fixes centcom officers, clowns, and mimes spawning without emergency supply boxes by making them use the outfit system. Adds prybars to promethean emergency lunchboxes.
Fixes #6154
2019-11-04 01:36:45 +00:00
lolman360
ae859c49e9
[READY] Recolourable energy weapons. ( #6507 )
2019-11-01 12:38:06 -04:00
Rykka Stormheart
c177796c2d
Add Sounds to stuff! (Port from VOREStation)
2019-10-29 17:32:08 -04:00
Heroman3003
a3fb3e3950
Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin
2019-10-29 09:33:48 +10:00
Novacat
54aeb32617
Merge pull request #6091 from Novacat/nova-ert
...
Uplink additions
2019-10-21 21:01:06 -04:00
Unknown
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
Mechoid
169d8acedd
Medical Expansion
2019-10-19 23:28:38 -04:00
Heroman
3e31046aef
Fixes file discrepancy for autolathe ammo recipies
2019-10-14 05:35:30 +10:00
Unknown
dade2aa80b
Conflict Resolution
2019-10-06 13:12:11 -04:00
Heroman
b41963d179
Adds vorestation wallconsoles to autolathe
2019-09-24 19:02:05 +10:00
Rykka
f3654d1b79
Amends name of outfits
2019-09-19 20:58:10 -06:00
Rykka
c9e6a417f3
Adds Waiter/Waitress
2019-09-19 20:45:13 -06:00
Novacat
305e79db40
Merge pull request #5834 from Novacat/nova-heterochromia
...
Cargo hardsuit changes
2019-09-14 00:39:23 -04:00
Unknown
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
Heroman
a1a395a1a9
Implements borg spawners
2019-09-06 16:27:51 +10:00
Unknown
e34091d1ad
Ports 6440 early
...
Also moves some new security crate datums to its proper place
2019-09-03 18:22:32 -04:00
Novacat
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
Cyantime
b751e0e8bd
Updates paths due to Polaris change
2019-09-01 18:24:35 -04:00
Novacat
f095ef0f0f
Merge branch 'master' into securitycargoimplant
2019-09-01 07:27:56 -04:00
MrSign
de4e350a36
Update security.dm
2019-09-01 21:21:27 +10:00
Unknown
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
Unknown
4bccbedc91
Minor Fixes
...
- Brings pizza back at 50 points which it was supposed to be.
2019-08-24 18:26:50 -04:00
Novacat
06fcadf97f
Merge pull request #5688 from VOREStation/upstream-merge-6396
...
[MIRROR] Chemistry Expansion
2019-08-21 18:01:11 -04:00
Atermonera
8f067fe785
Chemistry Expansion
2019-08-21 17:43:01 -04:00
Atermonera
caa612e264
Uniform Adjustments Phase 1
2019-08-21 17:26:28 -04:00
Novacat
99d9653902
Merge branch 'master' into Toricrates-Remastered
2019-08-19 16:56:12 -04:00
Michiyamenotehifunana
3a676ad02e
Adds Toricrates and stuff
2019-08-15 22:22:28 +08:00
Unknown
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
Unknown
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
Novacat
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
Andrew
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
