SplinterGP
ab4f960598
Merge branch 'master' into master
2020-06-27 15:39:46 -03:00
SplinterGP
bfda1018c1
fixes runtime(hopefully) on slime on using oculusosone
2020-06-27 12:29:33 -03:00
SplinterGP
fea9f5397f
sprite back to the snow be white like it should be
2020-06-27 11:23:32 -03:00
SplinterGP
8df8820edf
Begone pink triangles
2020-06-27 04:55:31 -03:00
SplinterGP
2424a9f6d7
More autolathe fixes and icon stuff
2020-06-23 22:01:48 -03:00
SplinterGP
bc5d25c208
autolathe fixes
2020-06-22 22:55:58 -03:00
izac112
f2a3eb5f32
hop does not manage explo in our chain
2020-06-19 22:45:46 +02:00
izac112
c0fd0e0a45
comment out
2020-06-17 08:50:07 +02:00
izac112
ff9f2b40a6
need to commit to test
2020-06-17 08:19:21 +02:00
izac112
65e4bd22d4
thing.egg
2020-06-17 07:36:15 +02:00
izac112
27f8bebd7b
temp1
2020-06-17 07:32:53 +02:00
izac112
bfe139f95f
temp
2020-06-17 07:28:54 +02:00
izac112
9178da5481
Merge branch 'master' into izac-tgs
2020-06-17 06:24:27 +02:00
izac112
cf3238b0e2
new commands first draft
2020-06-17 06:20:18 +02:00
izac112
c6105684db
tweak
2020-06-17 05:57:55 +02:00
izac112
57c53c7115
.
2020-06-17 05:54:04 +02:00
izac112
0eeb1fdc98
Makes mods actually show up
2020-06-17 05:52:15 +02:00
izac112
dd22d0093c
fixes
2020-06-17 04:36:50 +02:00
izac112
4864ad384d
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-06-17 04:30:06 +02:00
SweetBlueSylveon
bf5d9f1fc8
NanoUI tweak ( #8268 )
...
* Machines can't be used by clowns.
The old system was unfair, only the carbons or the silicons amongst us were allowed to use computers or see the internet. Or adjust the thermostat. But no longer. But changing this area here, it lets any mob with "has_hands = TRUE" use the objects they should be allowed to..
* simple_mob Revolution
Allows simple mobs to interact with nanoUI if they have "have_hands = TRUE".
* Revert "Machines can't be used by clowns."
This reverts commit 3cb16f57c0986e492c8f247598fc74773cebea63.
* Moves patch.
Moves Patch to default_vr.dm
* Adds missing part to machinery fix.
Fixes my dummy mistake and effectively unreverts the original commit.
2020-06-16 00:51:02 -04:00
Aronai Sieyes
2798866f20
Merge pull request #8267 from SweetBlueSylveon/Pips-mess-of-clowns
...
Pips mess of clowns
2020-06-16 00:47:16 -04:00
Aronai Sieyes
dd662a2965
Merge pull request #8288 from KillianKirilenko/kk-misc
...
[LOADOUT] Alt. Paramedic Jacket + Paramedic Vest
2020-06-16 00:45:24 -04:00
Arokha Sieyes
862aef7e41
Log all supply purchases for stats generation
2020-06-16 00:19:57 -04:00
Killian
24ef73ca38
Update loadout_suit_vr.dm
2020-06-15 21:41:07 +01:00
Killian
37a2a052d9
Update loadout_suit_vr.dm
2020-06-15 21:28:54 +01:00
SweetBlueSylveon
2105198db8
Cuts down on code.
...
Cuts down on code by removing a large chunk of redundant lines wrieeten for every mob.
2020-06-15 12:03:01 -07:00
Aronai Sieyes
652a0c5b1c
Merge pull request #8284 from Novacat/nova-basicfixes
...
Reduces Default (and mob) digestion rate
2020-06-15 11:37:09 -04:00
Aronai Sieyes
1de402fce9
Merge pull request #8255 from KillianKirilenko/kk-traffic2
...
Killian's Improved Traffic System, Take Two
2020-06-15 11:36:35 -04:00
Aronai Sieyes
08c32e9bd1
Merge pull request #8257 from lm40/master
...
Adds medical graviton eyepatch
2020-06-15 11:33:30 -04:00
Aronai Sieyes
e9c904b8e7
Merge pull request #8260 from lbnesquik/Kot-Explorer-Shield
...
Introduce a SINGLE themed, colored explorer shield.
2020-06-15 11:33:14 -04:00
Aronai Sieyes
9c588ab41c
Merge pull request #8282 from KasparoVy/sharpest-edgiest-rogue
...
Adds Creation of Whetstones from Durasteel & Plastitanium
2020-06-15 11:30:03 -04:00
Aronai Sieyes
2bed004132
Merge pull request #8283 from knoxon1/zenasuit
...
Adds Zena's Shroud Suit Fluff Item
2020-06-15 11:29:54 -04:00
Unknown
1b8409beda
Reduces Default (and mob) digestion rate
...
from 2/2 to 0.5/0.5
Due to a discussion in exploration, and the preferences stated by a headmin.
2020-06-15 01:20:51 -04:00
Novacat
c945f10900
Merge pull request #8281 from VOREStation/upstream-merge-7278
...
[MIRROR] Remove Unused Image Assets
2020-06-15 00:59:25 -04:00
knoxon1
2f15905e6e
aaa
2020-06-14 22:55:02 -05:00
KasparoVy
215792e703
Adds Creation of Whetstones from Durasteel & Plastitanium
...
Can currently be done with plasteel and titanium.
2020-06-14 23:13:42 -04:00
Atermonera
bcd18e4997
Merge pull request #7278 from VOREStation/vplk-unused-image-assets
...
Remove Unused Image Assets
2020-06-14 21:32:34 -04:00
Atermonera
7834c074f1
Merge pull request #7276 from lbnesquik/Kot-Supply-updatye
...
Make it so you can FINALLY export other things but platinum and phoron.
2020-06-14 21:31:20 -04:00
Novacat
4e889046e9
Merge pull request #8274 from Novacat/nova-basicfixes
...
Vox Phoron and Adminbus Backpacks
2020-06-14 15:48:40 -04:00
Novacat
6c899ae143
Merge pull request #8276 from VOREStation/Verkister-patch-2
...
Earlyports prommie passive gain fix
2020-06-14 15:47:47 -04:00
Novacat
1cd8d17e51
Merge pull request #8264 from VOREStation/upstream-merge-7257
...
[MIRROR] Telecomms fixes
2020-06-14 15:38:04 -04:00
Novacat
71358c42c8
Merge pull request #8269 from VOREStation/upstream-merge-7290
...
[MIRROR] mining drill and recharger find their shiny new cells
2020-06-14 15:37:20 -04:00
Unknown
ff0716f501
Last minute fixes
2020-06-14 15:34:47 -04:00
Novacat
6563c832f5
Merge pull request #8270 from VOREStation/Verkister-patch-1
...
Re-re-fixes werebeast offset for the third time
2020-06-14 15:26:43 -04:00
Novacat
dbefffc9c8
Merge pull request #8259 from SweetBlueSylveon/bulldog-fix
...
Bulldog Fix
2020-06-14 15:26:12 -04:00
Novacat
45c4ce7b6e
Merge pull request #8258 from Heroman3003/Heroman3003-adg-meme-1
...
Adds Recursive Dark Gygax
2020-06-14 15:25:51 -04:00
Novacat
eb3852f7a9
Merge pull request #8272 from VOREStation/Arokha/moresafe
...
Add more safety around the hours query
2020-06-14 15:24:17 -04:00
Verkister
b2717bd397
Update prometheans.dm
2020-06-14 22:23:46 +03:00
Novacat
08d50ee600
Update machinery.dm
2020-06-14 15:21:47 -04:00
Verkister
3b2d80af29
Update prometheans.dm
2020-06-14 22:19:07 +03:00
