cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 12:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,455 Commits 9 Branches 26 Tags
d78ed0decb6d050044cc2c6209fadbc0ffc90944
Commit Graph

41164 Commits

Author SHA1 Message Date
Leshana
d78ed0decb Fix unwanted line wraps in vv bitfield editor. 2021-06-17 16:04:13 -04:00
Novacat
85569fff1b Merge pull request #10657 from TheDavestDave/phaser-handbow 
adds the phaser handbow
 2021-06-17 15:49:27 -04:00
Novacat
8d33fa238a Merge pull request #10660 from klaasjared/Talon_Merch 
ITV Merchandise (Talon Gear)
 2021-06-17 15:48:59 -04:00
Heroman
1e6682be3a Fixes promethean hair remaining transparent when it is disasbledparent despite 2021-06-18 05:02:59 +10:00
Aronai Sieyes
11e76bde92 Merge pull request #10476 from Very-Soft/Gatewaytime 
More Gateway Stuff!
 2021-06-17 00:52:45 -04:00
VerySoft
b52960cc97 Adjust sidewalks to work with upcoming lighting changes 2021-06-16 03:07:03 -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
fec5ce879c Just don't print item attack messages on attackby 2021-06-15 17:12:14 -07:00
TheDavestDave
6662c1d540 Update munitions_vr.dm 2021-06-16 00:34:42 +01:00
Novacat
d394aebfd0 Merge pull request #10656 from ShadowLarkens/multitool_and_attackby_fix 
Make item/attackby call ..(), multitool tool quality fix
 2021-06-15 18:59:24 -04:00
TheDavestDave
c9c0c77054 adds the phaser handbow 
adds a resprited phaser holdout. Instead of a beam it does a bolt that does the exact same damage. it also has no non-taser replacement becuase it needed it's own spirte and I already modded it twice for lethal and low power.
 2021-06-15 23:37:51 +01:00
ShadowLarkens
0c86721788 Make item/attackby call ..(), multitool tool quality fix 2021-06-15 14:45:43 -07:00
Heroman
0ce0af6a4e Refluffs Pink Moo into Pink Russian 2021-06-15 16:39:28 +10:00
Novacat
61dfa77962 Merge pull request #10637 from VOREStation/upstream-merge-8097 
[MIRROR] Portable mapping devices
 2021-06-14 14:37:36 -04:00
Novacat
4aea61dec4 Revert "[MIRROR] Fixes some unseen combat ai jank" 2021-06-14 13:36:59 -04:00
Novacat
87440b8a12 Merge pull request #10638 from VOREStation/upstream-merge-8116 
[MIRROR] Fixes some unseen combat ai jank
 2021-06-14 13:35:36 -04:00
Novacat
c6141c3bde Update mapper.dm 2021-06-14 13:35:16 -04:00
Novacat
8973063282 Merge pull request #10640 from VOREStation/upstream-merge-8122 
[MIRROR] Make req_[one_]access lazy
 2021-06-14 13:34:47 -04:00
Novacat
96edb49393 Update map.dm 2021-06-14 08:21:46 -04:00
Novacat
8565237711 Update access.dm 2021-06-14 08:20:56 -04:00
Novacat
034cf08b54 Update supply.dm 2021-06-14 08:20:35 -04:00
Novacat
77fe685cdf Merge branch 'master' into upstream-merge-8097 2021-06-14 08:19:07 -04:00
Novacat
33efe81f18 Update mapper.dm 2021-06-14 08:17:26 -04:00
Novacat
e65b568e83 Update screen_objects.dm 2021-06-14 08:16:15 -04:00
Novacat
7e89721063 Update ai_holder_combat_unseen.dm 2021-06-14 08:14:58 -04:00
Novacat
13e03b3c41 Merge pull request #10643 from VOREStation/upstream-merge-8126 
[MIRROR] Added unit test to ensure emote key uniqueness.
 2021-06-14 08:14:03 -04:00
Novacat
2ff7a68883 Merge pull request #10642 from VOREStation/upstream-merge-8125 
[MIRROR] ripleys autoscoop ore in an aoe
 2021-06-14 07:57:53 -04:00
Novacat
bc9ba53c1f Update audible.dm 2021-06-14 07:55:04 -04:00
Novacat
ead2670328 Merge pull request #10644 from VOREStation/upstream-merge-8129 
[MIRROR] leg holsters in cargo crate
 2021-06-14 07:54:38 -04:00
Atermonera
e0f2aae531 Merge pull request #8135 from Ketrai/letthemeatcakeagain 
Makes the chaos cake cheaper.
 2021-06-14 03:35:28 -04:00
Atermonera
adbc5035b9 Merge pull request #8129 from Hatterhat/patch-1 
leg holsters in cargo crate
 2021-06-14 03:31:23 -04:00
Atermonera
fec4ba87e2 Added unit test to ensure emote key uniqueness. 2021-06-14 03:30:01 -04:00
Atermonera
b2e3c5c918 Merge pull request #8125 from Hatterhat/yet-another-ripley-buff 
ripleys autoscoop ore in an aoe
 2021-06-14 03:28:44 -04:00
Atermonera
70dc368d27 Make req_[one_]access lazy 2021-06-14 03:23:03 -04:00
Verkister
20535eb0b4 Fixes some unseen combat ai jank 2021-06-14 01:34:12 -04:00
Aronai Sieyes
74ee4843d2 Portable mapping devices 2021-06-14 01:32:59 -04:00
VerySoft
4b23706e48 It fix! 2021-06-13 23:33:54 -04:00
VerySoft
d461a75caa fix da parenthisis 2021-06-13 21:11:20 -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
1e9a6e024c Update doc 2021-06-12 20:07:41 -07:00
ShadowLarkens
5651059916 Autolathe: Show upgrade stats in examine 2021-06-12 18:17:48 -07:00
ShadowLarkens
5a4482012d Autolathe: Add multiplier buttons 2021-06-12 18:17:48 -07:00
ShadowLarkens
1b043d1938 Autolathe: Make 'All' show sheets 2021-06-12 18:17:48 -07:00
ShadowLarkens
2d43579447 Autolathe: Fix free recipes 2021-06-12 18:17:47 -07:00
ShadowLarkens
8efd22e4cf Autolathe: Change max_amount calculation to match /tg/ 2021-06-12 18:17:47 -07:00
ShadowLarkens
7ef6e26173 AutoLathe: Remove commented out code 2021-06-12 18:17:47 -07:00
ShadowLarkens
f1f0c3c7b2 Stack: Fix stack/use having a potential to sleep 2021-06-12 18:17:47 -07:00
ShadowLarkens
decee62598 MaterialContainer: Fix insert_amount_mat not incrementing total for specific material case 2021-06-12 18:17:47 -07:00
ShadowLarkens
194c84111e MaterialContainer+Autolathe: Support partial stack insertion 
Allows you to put 30 sheets of a 50 sheet stack into a machine
automatically, without having to manually split it.
 2021-06-12 18:17:47 -07:00
ShadowLarkens
2dc0305f4b MaterialContainer: Remove some unused code 2021-06-12 18:17:46 -07:00