cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-31 11:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,448 Commits 8 Branches 26 Tags
8d33fa238a47c19bdddc1b557132d68fcf4a9c85
Commit Graph

9003 Commits

Author SHA1 Message Date
Novacat
8d33fa238a Merge pull request #10660 from klaasjared/Talon_Merch 
ITV Merchandise (Talon Gear)
 2021-06-17 15:48:59 -04:00
Aronai Sieyes
11e76bde92 Merge pull request #10476 from Very-Soft/Gatewaytime 
More Gateway Stuff!
 2021-06-17 00:52:45 -04:00
klaasjared
bc497ca372 Adds EVERYTHING 
I never did any other commits so here is all the code stuffs
 2021-06-16 02:09:29 -04:00
ShadowLarkens
0c86721788 Make item/attackby call ..(), multitool tool quality fix 2021-06-15 14:45:43 -07:00
VerySoft
4b23706e48 It fix! 2021-06-13 23:33:54 -04:00
VerySoft
fa6510f36c New Gateway Stuff! 
Some new gateway things, it mostly works I just need to populate things and work out a couple kinks.
 2021-06-13 21:04:29 -04:00
ShadowLarkens
f1f0c3c7b2 Stack: Fix stack/use having a potential to sleep 2021-06-12 18:17:47 -07:00
Aronai Sieyes
3c8cfdc267 Merge pull request #10611 from VOREStation/upstream-merge-8123 
[MIRROR] stops armour plate and armour plate inserts having the same name, and…
 2021-06-11 15:21:49 -04:00
Killian
6eef6e406a Update misc_vr.dm 2021-06-11 19:34:10 +01:00
TheDavestDave
c88c88fe2c stops armour plate and armour plate inserts having the same name, and examine text as each other (#8123) 
armour plate and armour plate inserts have the same sprite, name, and examine text in game. I can fix two of  three things. You need to do stuff with amour plate inserts to make it fit in a plate carrier wile amour plate just will never fit
 2021-06-11 01:11:21 -04:00
Novacat
af53a2b523 Merge pull request #10598 from klaasjared/explo-duffle-fix 
Exploration Duffle Fix
 2021-06-09 10:42:06 -04:00
Verkister
6365bfa519 Fixes belly sensor jamming 
Get a load of that higgs bugson lmao
 2021-06-09 15:12:53 +03:00
klaasjared
313c3a7a2a Adds in fix and comments 
Fixes loadout to include new explo duffle and adds organizational comments to `backpack_vr.dm` to make it look nice.
 2021-06-09 06:36:57 -04:00
Aronai Sieyes
8fd03db2f6 Fix random holoplant bug 2021-06-08 18:10:31 -04:00
Aronai Sieyes
313d082a73 Redoes PR #10581 2021-06-07 14:26:09 -04:00
Aronai Sieyes
12585ed35e Merge pull request #10568 from VOREStation/upstream-merge-8111 
[MIRROR] Add Secret ZLevels
 2021-06-07 01:33:01 -04:00
Aronai Sieyes
f424ae9978 Merge pull request #10570 from VOREStation/upstream-merge-8117 
[MIRROR] Adds new UI for secure stuff
 2021-06-07 01:32:25 -04:00
Aronai Sieyes
b44a3a9ab8 Merge pull request #10569 from VOREStation/upstream-merge-8115 
[MIRROR] Random mob spawners can accept faction input now
 2021-06-07 01:12:43 -04:00
Aronai Sieyes
e952a30a42 Resolve merge 2021-06-07 00:57:50 -04:00
Shadow-Quill
da5a8ea4ef Adds new UI for secure stuff 2021-06-06 05:36:17 -04:00
Casey
6da5c20322 Random mob spawners can accept faction input now (#8115) 
* Random mob spawners can accept faction input now

The variable was there, just not used for anything, so I fix

* Update code/game/objects/random/mob.dm

Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>

Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2021-06-06 05:24:33 -04:00
Novacat
97abfd0549 Add Secret ZLevels 2021-06-06 05:23:19 -04:00
Atermonera
228c1b6999 Merge pull request #8104 from Cerebulon/rocknroll 
Adds new rocks + resprites mining outcrops
 2021-06-06 05:17:54 -04:00
Aronai Sieyes
fd78c894fe Merge pull request #10535 from SpaceVampire/Chess 
Chessboard Holodeck TG-Style.
 2021-06-02 12:01:56 -04:00
Aronai Sieyes
59c048ed4b Fixes #10526 2021-06-01 20:50:08 -04:00
SpaceVampire
c4b3353880 oops 2021-06-01 20:32:27 -04:00
SpaceVampire
39f3200c95 chess 2021-06-01 20:29:21 -04:00
SpaceVampire
3a9bd1b345 Chess 2021-06-01 20:07:02 -04:00
Aronai Sieyes
db274375dc Merge pull request #10518 from VOREStation/Arokha/instrumental 
Ports musical instruments from /tg/
 2021-06-01 16:29:00 -04:00
Novacat
44e2d88e30 Merge pull request #10409 from TheDavestDave/master 
explo vender stuff
 2021-06-01 10:58:13 -04:00
Novacat
9d4b6e7ce0 Update flashlight_vr.dm 2021-06-01 10:47:20 -04:00
TheDavestDave
c1da12592e changes some things on ascian's request 
faster cranking holdout is out the vender until I can make a decent sprite for it
 2021-06-01 14:36:38 +01:00
Aronai Sieyes
89a2043edc Fix some sources of sounds in /New 2021-05-31 20:16:07 -04:00
Aronai Sieyes
5ac6bd48d9 Ports /tg/ instruments 2021-05-31 19:13:52 -04:00
Aronai Sieyes
869520f818 Remove extra asterisks from rune audible messages 2021-05-31 13:13:57 -04:00
TheDavestDave
674362a862 Merge branch 'VOREStation:master' into master 2021-05-31 18:05:26 +01:00
Aronai Sieyes
a7e7b0f2a8 Merge pull request #10412 from Heroman3003/grand-theft-gender 
Adds gender TF chemicals + Spontaneous TF pref
 2021-05-30 19:00:16 -04:00
Aronai Sieyes
5a5a1ea8e9 Allow multiple SStranscore databases (#10450) 
* Allow multiple SStranscore databases

* Add key to backup implanter too

* Key passing tweak

* Fix issue Leshana spotted

* Add optimization Leshana spotted

* Fixxy more multitranscore bugs
 2021-05-30 18:53:18 -04:00
Aronai Sieyes
177fd15c30 Various onamonapoea 2021-05-30 15:45:11 -04:00
Aronai Sieyes
70ea101c96 Message piece combiner returns a list 2021-05-30 15:45:11 -04:00
Novacat
2a153a2d93 Merge pull request #10489 from VOREStation/upstream-merge-8109 
[MIRROR] Misc Bits
 2021-05-29 15:10:27 -04:00
Unknown
3aa5eccebd Removes Duplicates 2021-05-29 15:01:07 -04:00
TheDavestDave
845056ecb0 Merge branch 'VOREStation:master' into master 2021-05-29 19:54:54 +01:00
Atermonera
d7ddd0bc54 Misc Bits 2021-05-29 14:43:31 -04:00
Atermonera
ca31372d01 Merge pull request #8108 from lbnesquik/Kot-figure 
Make figurines small instead of normal sized
 2021-05-29 14:42:14 -04:00
Novacat
21658b8d85 Merge pull request #10401 from VOREStation/upstream-merge-8075 
[MIRROR] Reverts recipe changes from Industrial Expansion
 2021-05-27 13:16:06 -04:00
Aronai Sieyes
da4837903c Merge pull request #10433 from VOREStation/upstream-merge-8085 
[MIRROR] Linter Introduction + Cleanup
 2021-05-27 12:31:23 -04:00
Aronai Sieyes
3ee63e782a VS: Ambig OoO 2021-05-27 12:09:38 -04:00
Aronai Sieyes
4cfdd72c02 VS: Strange incorrect code times 2021-05-27 12:07:41 -04:00
Aronai Sieyes
eb9de2cb7c Merge pull request #10411 from VOREStation/Arokha/aro3 
Aro shipself v3
 2021-05-26 21:09:34 -04:00