Commit Graph

25097 Commits

Author SHA1 Message Date
Aronai Sieyes
7d69c69f14 VS: Port Bay's lockers and stuff 2020-05-31 12:26:00 -04:00
Aronai Sieyes
719151a74a Port Bay's lockers, crates, largecrates, wall lockers 2020-05-31 12:26:00 -04:00
Aronai Sieyes
35eee1fe2a Merge pull request #8149 from VOREStation/upstream-merge-7164
[MIRROR] Ported /tg/ style screen alerts, replacing the hunger icon with them
2020-05-31 12:15:48 -04:00
Atermonera
619e8b1b94 Ported /tg/ style screen alerts, replacing the hunger icon with them 2020-05-31 11:52:17 -04:00
Aronai Sieyes
76d20e4c7e Merge pull request #8154 from VOREStation/upstream-merge-7243
[MIRROR] Blob Infinite Loop Fix
2020-05-31 10:59:20 -04:00
Aronai Sieyes
80d6fdee86 Merge pull request #8158 from VOREStation/Arokha/autolokfix
Fix copypaste error
2020-05-31 10:53:17 -04:00
Aronai Sieyes
e341769720 Merge pull request #8163 from KillianKirilenko/kk-suits
AutoLok Tweaks
2020-05-31 10:52:45 -04:00
Killian
710cee0208 Update void_vr.dm 2020-05-31 11:04:13 +01:00
SweetBlueSylveon
9640367e88 Fixes two drinks.
Correctly maps "Dumb Shroom Juice" and "Unsweetened Tea" to /ethanol.
2020-05-31 01:59:34 -07:00
Arokha Sieyes
86242e421b Fix copypaste error 2020-05-31 01:27:50 -04:00
Atermonera
9e77aca051 Merge pull request #7243 from Mechoid/BlobLoop
Blob Infinite Loop Fix
2020-05-31 00:23:40 -04:00
Natje0
c882cd57ca add tentacle 2020-05-31 01:43:17 +02:00
Aronai Sieyes
a5de42d181 Merge pull request #8140 from SweetBlueSylveon/Drink-update
Drink update
2020-05-30 19:09:25 -04:00
SweetBlueSylveon
2c3c8e8450 Patch 2
Fixed indentations.
Removed "Icon_state" and "center_of_mass" where stated a second time.
2020-05-30 15:57:03 -07:00
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
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
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
ac2b2f5f61 Remove bloodspray when pulling standing people 2020-05-29 15:56:17 -04:00
Aronai Sieyes
12af6afc9b Alter playsound paradigm 2020-05-29 14:54:11 -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
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
39c7542b66 Merge pull request #8097 from VOREStation/Arokha/solgov
Fix solgov icons
2020-05-28 16:57:54 -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
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
Aronai Sieyes
ea8c29acc8 VS: Dogborg clotter 2020-05-27 16:44:37 -04:00
Aronai Sieyes
312f2bb58c Prevent wasting steel on unhealable damage 2020-05-27 15:25:22 -04:00
Aronai Sieyes
32a997e93d Merge pull request #8077 from VOREStation/vplk-vchat-load-check
Fix vchat loading history without errors
2020-05-27 15:01:26 -04:00
Aronai Sieyes
d4e31fd3eb Merge pull request #8085 from VOREStation/Arokha/borgos
Medihound inventory changes
2020-05-27 15:01:04 -04:00
Arokha Sieyes
cafaf0cd0a Dogborg sleeper tweaks 2020-05-27 01:18:21 -04:00
Arokha Sieyes
9e3b1507ba Fix excessive green in saved logs 2020-05-26 21:03:02 -04:00