cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 18:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,787 Commits 8 Branches 26 Tags
e42547db744f292ef3cddbb5c98e24ded3bb7e43
Commit Graph

27117 Commits

Author SHA1 Message Date
Aronai Sieyes
e42547db74 Various qdel helpers 2021-05-15 16:10:08 -04:00
Novacat
b9eb4eac15 Merge pull request #10330 from TheFurryFeline/TFF-AR_Visor_Port 
AR Visor
 2021-05-15 09:23:11 -04:00
TheFurryFeline
93b8773530 AR Visor 
Close https://github.com/CHOMPStation2/CHOMPStation2/issues/96

This adds something from pre-rebase Chompstation I always meant to add back in. Yay for motivation! Note: this is purely a cosmetic addition and a variation of a regular pair of AR glasses but you can change the tint in Char Setup. :3
 2021-05-15 08:59:17 -04:00
Novacat
4d940e54a4 Merge pull request #9969 from lukevale/master 
Adds in Booze hounds.
 2021-05-14 18:30:24 -04:00
lukevale
14e7ae9146 Cleans up the code after a month of it sitting with the errors. 2021-05-14 17:10:25 -05:00
Aronai Sieyes
f0ddc3b8b8 Merge pull request #10315 from VOREStation/upstream-merge-8042 
[MIRROR] Adds persistent smartfridges for garden products, material sheets
 2021-05-13 16:53:07 -04:00
Aronai Sieyes
ac5ec93548 Merge changes 2021-05-13 11:37:57 -04:00
Aronai Sieyes
f765cae30d Merge pull request #10309 from Novacat/nova-basicfixes 
Fixes Scream sounds
 2021-05-13 11:07:33 -04:00
Atermonera
62077da11c Adds persistent smartfridges for garden products, material sheets 2021-05-13 02:06:19 -04:00
TheFurryFeline
55bbaa7dd9 Actually, remove VS edit comment 
Gonna port upstream.
 2021-05-12 19:58:08 -04:00
TheFurryFeline
362e6a7f8a Stop SSD Snorers 
Stops SSD snoring. ~I think. Unable to test due to hearing disability.~

🆑 
tweak - stop snoring if SSD
/🆑
 2021-05-12 19:53:21 -04:00
Novacat
2ff4587ae0 Merge pull request #10311 from lm40/master 
RE-ADDS SQUISH
 2021-05-12 13:55:56 -04:00
lm40
89662bca8d actually i put this in a stupid/ugly spot 2021-05-12 13:42:58 -04:00
lm40
0c00ee9fd0 Update emote.dm 2021-05-12 13:26:26 -04:00
Unknown
f1320f86b7 Fixes Scream sounds 2021-05-12 12:39:08 -04:00
Aronai Sieyes
cd16f636e9 Merge branch 'master' into Arokha/removeoldnifmenu 2021-05-12 10:12:17 -04:00
Aronai Sieyes
25ab7a0900 Update code/modules/nifsoft/nif_tgui.dm 
Shadow's suggestion

Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
 2021-05-12 10:11:04 -04:00
Aronai Sieyes
d712732f7a Fix mystery characters in character setup screen 2021-05-11 23:43:35 -04:00
Aronai Sieyes
c8f7709f89 Deprecate NIF statpanel in favor of TGUI 2021-05-11 23:43:22 -04:00
Aronai Sieyes
327cb7219f Update emotes at the end of setting up body 2021-05-11 21:06:19 -04:00
Aronai Sieyes
b32df33cd1 Fix nme/nsay verbs and add starting_software 2021-05-11 21:06:08 -04:00
Aronai Sieyes
dc2c20ed89 Shuffle some synth things 2021-05-11 14:20:30 -04:00
Aronai Sieyes
f3d8c04216 Revert "Fixes SSMobs Shattering due to Proteans" 
This reverts commit aa9c0c566c.
 2021-05-11 13:27:43 -04:00
Aronai Sieyes
165992f29c Merge pull request #10292 from VOREStation/Arokha/protplaceholder 
Add placeholder for protean robolimbs
 2021-05-11 02:15:57 -04:00
Aronai Sieyes
d7f885b886 Add placeholder for protean robolimbs 2021-05-11 02:02:43 -04:00
Unknown
aa9c0c566c Fixes SSMobs Shattering due to Proteans 
Port of https://github.com/PolarisSS13/Polaris/pull/8073
 2021-05-11 01:46:57 -04:00
Aronai Sieyes
9bf0df6c2d Fix NIF runtime 2021-05-10 23:10:33 -04:00
Unknown
4fdf2a1897 Fluff items 
https://forum.vore-station.net/viewtopic.php?f=27&t=1960

https://forum.vore-station.net/viewtopic.php?f=27&t=1958
 2021-05-10 17:17:56 -04:00
Killian
5068041b8f Merge branch 'master' into kk-ships2 2021-05-10 17:42:03 +01:00
Killian
a42682fdee Merge remote-tracking branch 'upstream/master' into kk-ships2 2021-05-10 17:38:30 +01:00
Aronai Sieyes
c4610a858d Move ore lists to global lists 2021-05-10 12:13:39 -04:00
Unknown
e627c03ff0 Fixes Wing/Tail/Ear Sanitation 
Basically it forgot to account for species that can select their icon base.
 2021-05-10 10:00:41 -04:00
Novacat
25fcce0fa9 Merge pull request #10271 from Heroman3003/pizza-time 
Adds pizza guy uniform
 2021-05-10 03:19:30 -04:00
Atermonera
3ac3b76143 Merge pull request #8046 from Atermonera/view_global_variables 
Adds verb to VV global variables
 2021-05-09 20:34:09 -04:00
Killian
7238f3917e Merge remote-tracking branch 'upstream/master' into kk-ships2 2021-05-09 20:19:20 +01:00
Killian
9f156e2e7d 1Z Talon - R2.0 
banished 2z talon to the deprecated folder (begone ~~thot~~ block), fixed the refinery with a couple of hacks (now processes ore, doesn't give points!), and adjusted the custom spawners in cargo
 2021-05-09 20:17:58 +01:00
Heroman
3c4f0d71ae Adds pizza guy uniform 2021-05-09 18:47:55 +10:00
Heroman
0437d0ae69 Adds Jams Sensors belly mode 2021-05-09 12:39:33 +10:00
Novacat
c1a095e564 Merge pull request #10268 from Heroman3003/expand-mob 
Adds a big batch of mobs to maint pred pool
 2021-05-08 21:36:18 -04:00
Heroman
0a3fe08c64 Adds a big batch of mobs to maint pred pool 2021-05-09 11:17:24 +10:00
Heroman
d83a84c4e3 Merge branch 'master' into choke-gut 2021-05-09 10:47:03 +10:00
Novacat
758c28808e Merge pull request #10222 from klaasjared/Explo-Catalogue-Entries 
Catalogue Entries V1
 2021-05-07 19:21:57 -04:00
Novacat
999a58c9ec Update code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-05-07 18:41:10 -04:00
Novacat
0ab1cb1dc0 Update code/modules/mob/living/simple_mob/subtypes/vore/rat.dm 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-05-07 18:41:01 -04:00
Novacat
54849ff708 Update code/modules/mob/living/simple_mob/subtypes/vore/rat.dm 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-05-07 18:40:56 -04:00
Novacat
df4a84e0f8 Update code/modules/mob/living/simple_mob/subtypes/vore/frog.dm 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-05-07 18:40:49 -04:00
klaasjared
d48f458821 Adds requested changes 
Adds in the requested changes to the lore.
 2021-05-07 18:26:39 -04:00
Aronai Sieyes
4e95d72466 Readd nif softshop descriptions as tooltips 2021-05-07 17:27:48 -04:00
Atermonera
a347843d02 Merge pull request #8064 from MistakeNot4892/styles 
Fixes Virgo #10254.
 2021-05-07 03:16:50 -04:00
Aronai Sieyes
d3d759757b Merge pull request #9947 from Little-119/itoldyoutomakethemmeatier 
Remove the throwing-people-to-the-floor effect of meteor strikes
 2021-05-06 14:10:02 -04:00