cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,722 Commits 8 Branches 26 Tags
4fdf2a18974307a684fc94de349057a431a81a41
Commit Graph

57722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Novacat
4954315575 Merge pull request #10228 from KillianKirilenko/kk-ships2 
1Z Talon Project
 2021-05-10 16:18:16 -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
Novacat
f35b38a464 Merge pull request #10280 from VOREStation/Arokha/multiore 
Allow more than one ore processor
 2021-05-10 12:33:08 -04:00
Aronai Sieyes
7d143e2b2b VS: Move ore lists to global lists 2021-05-10 12:13:50 -04:00
Aronai Sieyes
c4610a858d Move ore lists to global lists 2021-05-10 12:13:39 -04:00
Killian
f5bb7690c7 1Z Talon - 2.0c 
oops, a comma
 2021-05-10 15:57:59 +01:00
Killian
24385e978d 1Z Talon - 2.0b 
cleanup
 2021-05-10 15:37:53 +01:00
Novacat
8501b82da3 Merge pull request #10279 from Novacat/nova-basicfixes 
Fixes Wing/Tail/Ear Sanitation
 2021-05-10 10:37:42 -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
Novacat
fda19aa21f Merge pull request #10276 from VOREStation/upstream-merge-8069 
[MIRROR] The Personal Computer Unit
 2021-05-10 03:19:12 -04:00
VirgoBot
1de27f102c The Personal Computer Unit 2021-05-10 01:16:43 -04:00
Atermonera
a712cdf5cc Merge pull request #8069 from klaasjared/The-PCU 
The Personal Computer Unit
 2021-05-10 01:16:43 -04:00
Heroman
7634dd0062 Removes the map addition 2021-05-10 14:39:05 +10:00
Novacat
5c2c83cd81 Merge pull request #10273 from VOREStation/upstream-merge-8046 
[MIRROR] Adds verb to VV global variables
 2021-05-09 20:51:00 -04:00
VirgoBot
bea7c95c94 Adds verb to VV global variables 2021-05-09 20:34:09 -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
Novacat
c81bb0d041 Merge pull request #10272 from VOREStation/upstream-merge-8070 
[MIRROR] Updates CI's OS image version to fix package deficiency
 2021-05-09 20:31:35 -04:00
VirgoBot
bffbb5be06 Updates CI's OS image version to fix package deficiency 2021-05-09 20:21:26 -04:00
Atermonera
c029f8e203 Merge pull request #8070 from Atermonera/CI_OSImage 
Updates CI's OS image version to fix package deficiency
 2021-05-09 20:21:26 -04:00
Killian
ae1b2180f7 1Z Talon - R2.0a 
final polish, merge fixes
 2021-05-09 23:51:03 +01:00
Novacat
76148dfb7d Merge pull request #10257 from Novacat/nova-ert 
Changes some Exploration Colors
 2021-05-09 17:21:19 -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
Novacat
b28380496a Merge pull request #10269 from Heroman3003/jam-them-sensors 
Adds Jams Sensors belly mode addon
 2021-05-09 08:54:35 -04:00
Heroman
3c4f0d71ae Adds pizza guy uniform 2021-05-09 18:47:55 +10:00
Heroman
0898ac4f9f Refactors to be more specific to its purpose. 2021-05-09 13:25:34 +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
Novacat
5ba06da5e7 Merge pull request #9820 from Heroman3003/choke-gut 
Adds Suffocation Damage option to vore panel/bellies
 2021-05-08 20:59:35 -04:00
Heroman
a26faab5a7 Fixes conflicts 2021-05-09 10:48:54 +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
Novacat
dc095424ff Merge pull request #10267 from VOREStation/Arokha/niftip 
Readd nif softshop descriptions as tooltips
 2021-05-07 17:47:54 -04:00
Aronai Sieyes
4e95d72466 Readd nif softshop descriptions as tooltips 2021-05-07 17:27:48 -04:00
Novacat
e2bd3e806f Merge pull request #10265 from VOREStation/upstream-merge-8064 
[MIRROR] Fixes Virgo #10254.
 2021-05-07 03:26:28 -04:00
VirgoBot
348b36d6bc Fixes Virgo #10254. 2021-05-07 03:16:50 -04:00
Atermonera
a347843d02 Merge pull request #8064 from MistakeNot4892/styles 
Fixes Virgo #10254.
 2021-05-07 03:16:50 -04:00
Novacat
a18967a1e2 Merge pull request #10264 from DigitalSquirrel95/patch-5 
Update alienwhitelist.txt
 2021-05-06 17:22:46 -04:00
Novacat
d64c06723d Update config/alienwhitelist.txt 
Co-authored-by: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com>
 2021-05-06 15:47:18 -04:00
Killian
310d1737b3 1Z Talon - R1.9a 
tweaked papers, spare fuel, replaced posters with holoposters (for now?)
 2021-05-06 20:37:30 +01:00
DigitalSquirrel95
607a7c18af Update alienwhitelist.txt 
Updates the whitelist with a new Protean Whitelist - https://forum.vore-station.net/viewtopic.php?f=46&t=1963
 2021-05-06 15:07:24 -04:00