cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 10:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,662 Commits 8 Branches 26 Tags
c6fa02843fa6a7411e3c43385338dfedf708287c
Commit Graph

2239 Commits

Author SHA1 Message Date
Novacat
7fad3f6620 Merge pull request #10727 from Novacat/nova-basicfixes 
Medicine Tweaks
 2021-06-23 12:33:57 -04:00
Aronai Sieyes
18962f7a77 Merge pull request #10719 from VOREStation/upstream-merge-8150 
[MIRROR] Linter diagnostics + bans non-var relative pathing
 2021-06-22 18:16:13 -04:00
Unknown
e5891bc972 More medicine fixes 2021-06-22 11:13:18 -04:00
Aronai Sieyes
85c31e9fda WIP fix of this PR 2021-06-21 19:29:43 -04:00
Atermonera
b3aa6f5f0c Refactors posters to use decls 2021-06-20 19:14:45 -04:00
MarinaGryphon
385fa640af Linter diagnostics + bans non-var relative pathing 2021-06-20 18:16:45 -04:00
TheDavestDave
dcc934fb94 Merge branch 'phaser-handbow' of https://github.com/TheDavestDave/VOREStation into phaser-handbow 2021-06-20 00:52:38 +01:00
TheDavestDave
539837dc2a Update munitions_vr.dm 
small name error for handbow crate
 2021-06-20 00:50:59 +01:00
Novacat
65ba367501 Merge pull request #10686 from VOREStation/upstream-merge-8146 
[MIRROR] Removes Global Iterators
 2021-06-19 09:43:39 -04:00
Anthony Rodriguez
71303a2069 Syncing 2021-06-18 13:43:26 -07:00
Anthony Rodriguez
125e1ae4c2 Staff Feedback requests 2021-06-18 13:38:15 -07:00
MarinaGryphon
c05a5c8f5e Removes Global Iterators 2021-06-18 14:07:16 -04:00
Aronai Sieyes
e749537a98 Merge pull request #10683 from VOREStation/Arokha/runtimes 
6 fixes
 2021-06-18 14:01:58 -04:00
Aronai Sieyes
42eb6b9eea Add debugging code to find source of qdels 
These objects are being deleted by something, but I don't know what.
 2021-06-18 13:50:28 -04:00
Aronai Sieyes
42191c2cae Fix runtimes in chat_message 
Do clients get deleted asynchronously?
I don't see how we can get here, and have null owner
But I'm seeing runtimes that say owner is null here.
 2021-06-18 13:36:20 -04:00
Leshana
342b1bc341 Fix compiler warning from unused var. 2021-06-18 11:13:12 -04:00
Novacat
8b447d8b1d Merge pull request #10662 from VOREStation/Arokha/lights2 
Port current /tg/ lighting system
 2021-06-18 00:21:58 -04:00
Leshana
d78ed0decb Fix unwanted line wraps in vv bitfield editor. 2021-06-17 16:04:13 -04:00
Aronai Sieyes
db14882664 Port tg lighting system 
Also converts planet lighting to a new system
Too hard to separate out from this PR
 2021-06-17 00:18:09 -04:00
TheDavestDave
6662c1d540 Update munitions_vr.dm 2021-06-16 00:34:42 +01: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
Atermonera
adbc5035b9 Merge pull request #8129 from Hatterhat/patch-1 
leg holsters in cargo crate
 2021-06-14 03:31:23 -04:00
ShadowLarkens
1b043d1938 Autolathe: Make 'All' show sheets 2021-06-12 18:17:48 -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
ShadowLarkens
d429124b80 MaterialComponent: Remove broken precise insertion 
This doesn't actually work, we shouldn't even have it as an option to
trick people.
 2021-06-12 18:17:46 -07:00
ShadowLarkens
a3674a664d Autolathe: Implement Material Container Component 
First implementation, allows insertion but printing doesn't work yet.
 2021-06-12 18:17:46 -07:00
ShadowLarkens
2a70cfe91f MaterialContainer: Add a component to hold materials 
No implementations in this commit.
 2021-06-12 18:17:44 -07:00
Aronai Sieyes
313d082a73 Redoes PR #10581 2021-06-07 14:26:09 -04:00
VerySoft
fec7b521cd Put the music speakers in crates! 
You can order them, but they don't appear on the shuttle!
 2021-06-06 19:03:41 -04:00
Aronai Sieyes
12197dc1cf Make both obtainable 2021-06-05 03:07:12 -04:00
Aronai Sieyes
d9ecff2cb6 PodZu Portable Music Player 2021-06-05 03:07:07 -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
Aronai Sieyes
0a2cc64a1e Runechat: Everything not a mob is an obj 2021-06-01 14:54:29 -04:00
Novacat
44e2d88e30 Merge pull request #10409 from TheDavestDave/master 
explo vender stuff
 2021-06-01 10:58:13 -04:00
Novacat
e00f546407 Update supply.dm 2021-06-01 10:39:21 -04:00
Novacat
4b3033f4f0 Update supply.dm 2021-06-01 10:26:48 -04:00
Novacat
fa023f8755 Update supply.dm 2021-06-01 10:25:15 -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
099e3dedcb Supplypacks, finish up headphones 2021-05-31 19:52:32 -04:00
Aronai Sieyes
5ac6bd48d9 Ports /tg/ instruments 2021-05-31 19:13:52 -04:00
Aronai Sieyes
4ee7acdb16 Fix bounding and micros 2021-05-31 15:26:23 -04:00
TheDavestDave
674362a862 Merge branch 'VOREStation:master' into master 2021-05-31 18:05:26 +01:00
Aronai Sieyes
f1c96ce398 Enable encoding chat emphasis in runechat 2021-05-31 11:33:32 -04:00
Aronai Sieyes
61fd8d67e6 Merge pull request #10505 from VOREStation/Arokha/miscfix 
Some misc runtime fixes
 2021-05-30 23:57:15 -04:00
Aronai Sieyes
631ac7756b Fix a typo in detective outfit 2021-05-30 23:46:01 -04:00
Aronai Sieyes
54ca5de611 Couple more runefixes 2021-05-30 23:17:56 -04:00
Aronai Sieyes
3331ffb5ba Fix chat message on different size mobs 2021-05-30 20:18:16 -04:00
Aronai Sieyes
44399bf7f5 Suggested changes, small opts 2021-05-30 17:20:09 -04:00