cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 02:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,956 Commits 8 Branches 26 Tags
bcd2afd09ce3cdd097ae469005a75edde30f5100
Commit Graph

2316 Commits

Author SHA1 Message Date
Casey
bcd2afd09c Merge pull request #12048 from Verkister/ponyshow2 
Fixes riding offsets not counting rider size
 2022-01-08 12:53:52 -05:00
Verkister
7cae8d2016 Fixes riding offsets not counting rider size 
Fixes riding offsets not counting rider size or the difference between the two, which would end up resulting in small riders on large mounts sitting nowhere near the back of the mount
 2022-01-08 18:45:06 +02:00
TheDavestDave
9ae21b2886 Update misc_vr.dm 2022-01-03 18:53:55 +00:00
TheDavestDave
9160a087bc adds swords to cargo crate 
xenoach is currently the only way to get real swords for players
 2022-01-03 18:49:44 +00:00
PastelPrinceDan
1efc116c6a also adds a cost to normal autoinjectors 2021-12-16 08:50:32 +00:00
PastelPrinceDan
7b3bafdf38 cheaper :) 2021-12-16 08:30:01 +00:00
Casey
ea36f8366e Merge pull request #11910 from PastelPrinceDan/cratefix 
fixes the commonwealth engi RIG having the wrong crate
 2021-11-22 23:42:15 -05:00
Casey
50e9e70486 Merge pull request #11901 from Heroman3003/sheetfix 
Fixes a bug with sheet storage and drawing too much
 2021-11-22 23:37:22 -05:00
PastelPrinceDan
b1708899fc easy fix 2021-11-23 02:23:33 +00:00
Heroman
dfa8c55180 Also fixes nullvoid 0-stack issues 2021-11-22 16:13:36 +10:00
Heroman
5438a64e64 Adds prefs for Corgi and Cursed Sword roles 2021-11-21 12:42:53 +10:00
PastelPrinceDan
246373c24d i don't want a lot for christmas 
there is just one thing i need
 2021-11-04 10:06:00 +00:00
Aronai Sieyes
b4ce0442cd Merge pull request #11722 from KillianKirilenko/kk-misc 
Hardwood Material Port
 2021-10-30 17:25:23 -04:00
Killian
fefda7e0da Update munitions_vr.dm 2021-10-30 09:49:42 +01:00
Killian
d92f085fbb Update munitions_vr.dm 2021-10-30 09:49:00 +01:00
Killian
70b88ad181 hardwood material port 2021-10-28 10:21:38 +01:00
Aronai Sieyes
0d5de2c054 Merge pull request #11599 from VOREStation/upstream-merge-8296 
[MIRROR] fixes crafting reqs not storing parts in the result
 2021-10-24 20:24:49 -04:00
Aronai Sieyes
a0debb7751 fixes crafting reqs not storing parts in the result 2021-10-24 20:08:17 -04:00
Aronai Sieyes
cc609bdde4 Merge pull request #11589 from VOREStation/upstream-merge-8293 
[MIRROR] Adds multitools to roboticist/engi toolbelts
 2021-10-24 20:04:46 -04:00
Aronai Sieyes
bb69d4554c Merge pull request #11553 from VOREStation/upstream-merge-8184 
[MIRROR] Refactors crafting to support requirement alternatives
 2021-10-22 14:23:31 -04:00
Aronai Sieyes
4571b1c886 Remove stray character 2021-10-22 14:13:21 -04:00
Ghost Actual
0085a5bd10 Adds more clothing from Polaris and various sources (#11546) 
* Base Commit

* Secondary Commit

* Small Addition

* Small Fix

* Yet another Commit

* small fix

* Small Fix

* Small Addition

* More Commit

* I don't know how to stop

* ushanka

* Small Fix

* *aaaaaaa*

* another add-on

* Small Fix

* Revert "Small Fix"

This reverts commit e674b81a0ddee893c6aa2dcdb92040040677351a.

* Conflict Fixes

* Revert "Conflict Fixes"

This reverts commit 1af644bdca.

* Conflict Fix 2
 2021-09-27 14:31:10 -04:00
Aronai Sieyes
6a34f3e7b5 Adjust existing recipes 2021-09-27 14:30:06 -04:00
Aronai Sieyes
c9fb50dcdc Further fix merge 2021-09-27 14:29:57 -04:00
Aronai Sieyes
c1103ff8cd Fix merge 2021-09-27 14:25:33 -04:00
MistakeNot4892
0386f03c57 Merge pull request #8293 from Schnayy/toolbelt-change 
Adds multitools to roboticist/engi toolbelts
 2021-09-12 20:16:05 -04:00
PastelPrinceDan
8e53affbe4 woo yeah hypos 2021-09-10 23:16:57 +01:00
Atermonera
ae87e4574b Refactors crafting to support requirement alternatives 2021-09-02 21:52:06 -04:00
Ghost Actual
4bb386e166 Expanding Clothing Options (#11466) 
* Base Commit

* Second Commit

* Third Commit

* Fourth Commit

* Fifth Commit

* Sixth Commit

* Seventh Commit

* Final (?) Commit

* Small Fix

* Small Fix

* Merge Fix

* Small Fix

* Additional Goods

* Small Fix
 2021-08-26 11:43:44 -04:00
Aronai Sieyes
e5c108269d Merge pull request #11454 from VOREStation/Arokha/stacks 
Make stack amount var private
 2021-08-26 11:38:33 -04:00
VerySoft
25894314d3 Adds the ability to ban people from ghost roles 
There are some mobs you can play as now that are PRETTY ABUSABLE, and there's some players who play fine normally, but get into trouble and take things too far when you put them in special roles, SO! Rather than just flat banning those people from the server, it would be cool if we could just, ban them from playing those roles. 

This should help with that.
 2021-08-23 06:32:54 -04:00
Hatterhat
bfac91465b Crusher Gaming (#11462) 
* [the who - baba o'riley plays in the background]

* i need more POWER

* rewrite pt1

* bug fixo

* uh oh! they're obtainable!

* verbs

* knif

* furthur cleanup

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2021-08-22 15:18:12 -04:00
Aronai Sieyes
e52031d6aa Make stack amount var private 2021-08-19 21:06:46 -04:00
klaasjared
14b342c8c7 Base Commit 2021-08-19 13:15:20 -04:00
VerySoft
6ba1086887 ALMOST DONE 2021-08-13 23:12:12 -04:00
VerySoft
29b29bf8a6 Survival crafting stuff 
Stuff! For surviving in the wilderness.
 2021-08-09 17:48:10 -04:00
Aronai Sieyes
748dff84e4 More helpers and a smol fix 2021-08-04 17:16:38 -04:00
Verkister
ae96f80201 H 2021-08-02 13:45:37 +03:00
Verkister
db7c90b33d Fixes the small hud buttons not getting hud colors 
Fixes the crafting, nif, charsetup, and vorepanel hud buttons not getting the user's hud color and transparency prefs applied.
 2021-08-02 13:39:51 +03:00
Aronai Sieyes
3075ca8b01 Add arcadey carpets 2021-07-29 14:31:40 -04:00
Aronai Sieyes
bfa9dd7118 Merge pull request #11207 from Hatterhat/second-pass 
[kinda wip but not really] bags boots and suit storage - a second pass on the bay suits
 2021-07-28 12:29:19 -04:00
Atermonera
464cada77c Merge pull request #8183 from Cerebulon/hopid 
Fixes blank ID sprite for HoP/Secretary
 2021-07-25 05:00:46 -04:00
Hatterhat
a804663ab4 bags boots and suit storage 2021-07-22 03:54:18 -05:00
Aronai Sieyes
01f999f10c Merge pull request #11165 from VOREStation/Arokha/lightport 
Small light optimizations
 2021-07-20 19:01:54 -04:00
Aronai Sieyes
34982728cb Add 'as anything' to various for loops 2021-07-20 12:39:59 -04:00
Aronai Sieyes
86fc5c3751 Optimize a few things in overlay lighting procs 
Credit to Rohesie
 2021-07-19 23:05:16 -04:00
MarinaGryphon
f5db6b47e8 Catches the rest, unfortunately including some comments. Oh well! 2021-07-16 15:58:57 -05:00
Aronai Sieyes
7619a96b23 Add recipe, subject to balancing 2021-07-15 18:00:02 -04:00
Aronai Sieyes
43822f5c50 Merge pull request #11080 from VOREStation/Arokha/bayport 
Ports new Bay SolGov suits as Commonwealth suits
 2021-07-15 15:02:01 -04:00
Aronai Sieyes
fcafbb9554 Commonwealth suit definitions 2021-07-15 01:20:17 -04:00