Commit Graph

38077 Commits

Author SHA1 Message Date
Aronai Sieyes
9c5e559f10 Merge pull request #8141 from KillianKirilenko/kk-suits
AutoLok Expansion: Tesh
2020-05-30 18:39:02 -04:00
Killian
8946c06d7c AutoLok Expansion: Tesh 2020-05-30 23:22:23 +01:00
Aronai Sieyes
09517feed5 Merge pull request #8139 from VOREStation/Arokha/metaglass
Allow reagents to have specific metaglass icon files
2020-05-30 18:20:21 -04:00
SweetBlueSylveon
003dc4205d Patch 1
Some files didn't transfer over for some reason. This fixes that.
2020-05-30 15:04:31 -07:00
SweetBlueSylveon
dcdf46212c Drink update
Adds 20 new drinks, 30 replaced sprites for old drinks, and adds 3 new sprites to drinks without one. Snow White recipe changed.
Requires"Allow reagents to have specific metaglass icon files" from Arokha.
2020-05-30 14:55:44 -07:00
Aronai Sieyes
90505c354f Merge pull request #8138 from KillianKirilenko/kk-suits
AutoLok Pressure Suit
2020-05-30 17:19:22 -04:00
Arokha Sieyes
982f523dd4 Allow reagents to have specific metaglass icon files 2020-05-30 16:58:05 -04:00
Killian
c3f08437f1 Update void_vr.dm 2020-05-30 21:16:23 +01:00
Killian
453311538e autolok pressure suit 2020-05-30 21:04:17 +01:00
Aronai Sieyes
46ac9858db Merge pull request #8129 from VOREStation/upstream-merge-7215
[MIRROR] Streamline (Facial) Hair & Marking Character Customization, Port color_square to Clean Prefcode
2020-05-30 14:20:51 -04:00
Atermonera
9a6b5a71f3 Streamline (Facial) Hair & Marking Character Customization, Port color_square to Clean Prefcode 2020-05-30 14:10:54 -04:00
Aronai Sieyes
f134b8ca2e Merge pull request #8128 from VOREStation/upstream-merge-7225
[MIRROR] Increase the amounts of SNACKS and cigarettes in vending machines.
2020-05-30 14:10:08 -04:00
Atermonera
16fea47d24 Increase the amounts of SNACKS and cigarettes in vending machines. 2020-05-30 13:59:35 -04:00
Aronai Sieyes
9cd3b04cc4 Merge pull request #8130 from VOREStation/Verkister-patch-1
Fixes R&D machines missing sprites
2020-05-30 09:24:57 -04:00
Aronai Sieyes
c2dffa5fa6 Merge pull request #8126 from VOREStation/Arokha/erisdecallayer
Make mapped in decals above auto-floor decals
2020-05-30 09:23:04 -04:00
Verkister
41d82e3519 Fixes R&D machines missing sprites
Removes a vorestation edit made redundant by upstream updates. The _vr file had incorrect iconstates, causing at least protolathe to turn invisible when in use.
2020-05-30 12:10:18 +03:00
Aronai Sieyes
5a56f0627f Make mapped in decals above auto-floor decals 2020-05-29 20:52:11 -04:00
Unknown
554ba9db25 Fixes accessory slots for uniforms 2020-05-29 19:55:35 -04:00
Aronai Sieyes
37ee2e500d Merge pull request #8122 from VOREStation/Arokha/standrag
Remove bloodspray when pulling standing people
2020-05-29 16:07:20 -04:00
Aronai Sieyes
8ccb084d54 Merge pull request #8121 from VOREStation/Arokha/morefloor
Further Eris floor blending tweaks
2020-05-29 16:05:52 -04:00
Aronai Sieyes
ac2b2f5f61 Remove bloodspray when pulling standing people 2020-05-29 15:56:17 -04:00
Aronai Sieyes
51f822b97f Merge pull request #8112 from VOREStation/upstream-merge-7205
[MIRROR] Alter playsound paradigm
2020-05-29 15:54:25 -04:00
Aronai Sieyes
12af6afc9b Alter playsound paradigm 2020-05-29 14:54:11 -04:00
Aronai Sieyes
6809133d75 Port Eris' extensive floor blending system 2020-05-29 14:00:43 -04:00
Aronai Sieyes
863142066d Merge pull request #8118 from dwinters99/posters
New posters
2020-05-29 11:08:02 -04:00
dwinters99
af10438e2f Update code/game/objects/effects/decals/posters/voreposters_vr.dm
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2020-05-29 10:57:40 -04:00
David Winters
ec470180ba Fixed typo, capitalization 2020-05-29 03:06:43 -04:00
David Winters
d57addfdea New posters
Following in Pip's wake, I made 11 posters. Not much more to say, really.
2020-05-29 03:00:00 -04:00
Aronai Sieyes
a20bcec893 Allow plating operations on 'floored' plating 2020-05-28 23:03:01 -04:00
Aronai Sieyes
97d6799cb2 Move the flooring cache onto the flooring decls 2020-05-28 23:00:32 -04:00
Aronai Sieyes
b8aa62d75a Merge pull request #8108 from VOREStation/Arokha/railguns
Tamper with railguns
2020-05-28 18:22:30 -04:00
Aronai Sieyes
d3b1b10f4c Merge pull request #8109 from Novacat/nova-ert
Adds Explorer weapons to Uplink
2020-05-28 18:21:48 -04:00
Unknown
bd1fbd13b5 Adds Explorer weapons to Uplink
Mostly adding a lil bit of variety. Holdout is equal to egun and Frontier carbine equal to laser carbine.
2020-05-28 17:10:52 -04:00
Aronai Sieyes
16c4762b50 Merge pull request #8095 from VOREStation/Arokha/oocnotes
Adds a verb to set OOC notes mid-round
2020-05-28 17:00:31 -04:00
Aronai Sieyes
954412a26a Merge pull request #8092 from VOREStation/Arokha/bloodspray
Give medihounds a new toy
2020-05-28 16:59:12 -04:00
Aronai Sieyes
ec12217ce6 Merge pull request #8096 from VOREStation/Arokha/sleevem8
Add sleevemate feature
2020-05-28 16:58:01 -04:00
Aronai Sieyes
39c7542b66 Merge pull request #8097 from VOREStation/Arokha/solgov
Fix solgov icons
2020-05-28 16:57:54 -04:00
Aronai Sieyes
4f6c4ff5c3 Merge pull request #8098 from VOREStation/Arokha/talonfloors
Redo Talon flooring
2020-05-28 16:57:48 -04:00
Aronai Sieyes
7dbec2db5e Merge pull request #8099 from VOREStation/Arokha/dropmsg
Make being disconnected painfully obvious
2020-05-28 16:57:41 -04:00
Aronai Sieyes
39935255e4 VS: KHI rail pistol 2020-05-28 16:47:50 -04:00
Aronai Sieyes
cff9440d2e Tweak railguns, add flechette pistol 2020-05-28 16:47:07 -04:00
Aronai Sieyes
f22a658ea1 POL: Water icon coloring 2020-05-28 15:12:51 -04:00
Unknown
a313950f62 Fixes compile 2020-05-28 14:22:46 -04:00
Unknown
77e08765c7 Readds accidentally deleted thing 2020-05-28 14:09:46 -04:00
Unknown
dacacf8bc8 Localization updates 2020-05-28 14:06:21 -04:00
Aronai Sieyes
ad820c6bc5 Make being disconnected painfully obvious 2020-05-28 12:56:00 -04:00
Aronai Sieyes
ce3db722d7 Add is_plating feature to flooring 2020-05-28 11:42:27 -04:00
Aronai Sieyes
667c49b80b Fix solgov icons 2020-05-28 10:26:08 -04:00
Arokha Sieyes
3bdbb63da6 Adds a verb to set OOC notes mid-round 2020-05-28 00:52:21 -04:00
Arokha Sieyes
83a9765691 Add sleevemate feature 2020-05-27 21:55:35 -04:00