cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 05:40:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,650 Commits 8 Branches 26 Tags
cd3f808efed75f1bbf96434f14aeb277d83107ba
Commit Graph

26153 Commits

Author SHA1 Message Date
Runa Dacino
cd3f808efe Implements Neural hypersensitivity 
* Adds species trauma_mod for calculating shock

* Changes shock calculations to include trauma_mod

* Implements negative trait "neural hypersensitivity"
 2020-12-04 20:28:54 +01:00
Novacat
2170cdc986 Merge pull request #9401 from Tenryumi/brads-maint-preds 
Adds 2 new maintenance predators: Sect queens and defanged xenomorphs
 2020-12-02 21:46:52 -05:00
Amy
455f9c4d3c also benos should fit 2 of 'em 2020-12-02 16:27:28 -06:00
Amy
b5cde57517 Adds Sect Queen + Defanged Xenomorph 2020-12-02 16:04:19 -06:00
Novacat
6afcf6548d Merge pull request #9392 from Wrackbang/master 
Fixes Spacer language color
 2020-12-02 15:40:33 -05:00
Wrackbang
9bd35b51c3 VOREStation Add comment to the style sheet inclusion 2020-12-02 12:20:54 -06:00
Killian
99c8ef8428 khi crg/civ uniforms 2020-12-02 13:15:42 +00:00
Wrackbang
a38b983d15 Fixes Spacer color 2020-12-02 00:42:10 -06:00
Unknown
a89c161aeb Nerfs bug in Protean Regeneration 
When Protean brute resistance was nerfed, I forgot to adjust Proteans brute healing to match the new value. This made Proteans a lot tankier than intended.
 2020-12-01 09:38:39 -05:00
Novacat
60217c38ae Merge pull request #9333 from Tenryumi/nikki-fluff 
Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
 2020-11-30 18:45:57 -05:00
Verkister
9ec68d6cc2 Gurgled PDA ID floor drop fix, borgo belly edition 
Fixes PDAs digested in sleeperbellies dropping their IDs on the floor.
 2020-11-30 12:24:08 +02:00
Novacat
3c7a9557dd Merge pull request #9374 from VOREStation/Verkister-patch-6 
Makes pixel shifting work with custom offsets
 2020-11-30 02:22:48 -05:00
Amy
66e94e9be9 Oh neat, the CI picks up on errors and 'errything. nice! 2020-11-29 14:39:10 -06:00
Amy
8daaff8fe3 Test change 2020-11-29 14:34:40 -06:00
Novacat
db63b57de1 Merge pull request #9379 from Runa-Dacino/horned-succubi 
Horned succubi
 2020-11-29 10:35:35 -05:00
Novacat
169397be53 Merge pull request #9378 from dwinters99/ridge-wallet 
Greek Chiton
 2020-11-29 10:35:11 -05:00
David Winters
d812f7eb22 i hate copy paste 2020-11-29 00:43:58 -05:00
Runa Dacino
b60b7b7406 Adds curly demon horns 
Credit to Peko#7770 for the sprite-art.
 2020-11-28 17:32:43 +01:00
David Winters
1469d31e99 WHO ARE YOU I AM FROM ANCIENT GREECE 2020-11-28 10:51:26 -05:00
Novacat
445621f57a Merge pull request #9373 from VOREStation/upstream-merge-7766 
[MIRROR] Teshari name generation fix
 2020-11-27 18:11:13 -05:00
Novacat
3e6c4be678 Merge pull request #9372 from VOREStation/upstream-merge-7761 
[MIRROR] Arm-Laser rebranding.
 2020-11-27 18:10:54 -05:00
Novacat
6cbd46f534 Merge pull request #9370 from VOREStation/upstream-merge-7755 
[MIRROR] Fixes pointing going under mobs.
 2020-11-27 18:10:22 -05:00
Verkister
4d1112db49 Makes pixel shifting work with custom offsets 
Pixel shifting now allows mobs with custom offsets to shift themselves 16 pixels from their default offsets instead of point zero. This means that a wide mob can now shift towards left without getting stopped due to being already at -16 at default offset.
 2020-11-26 21:51:52 +02:00
Atermonera
1ea9e0a215 Merge pull request #7766 from Greenjoe12345/teshname 
Teshari name generation fix
 2020-11-26 14:33:21 -05:00
Atermonera
b3067ab629 Merge pull request #7761 from Mechoid/ArmLaserUniquify 
Arm-Laser rebranding.
 2020-11-26 14:27:58 -05:00
Atermonera
7f9da4a7bc Merge pull request #7755 from BlackMajor/patch-2 
Fixes pointing going under mobs.
 2020-11-26 13:54:32 -05:00
Atermonera
57424983bf Merge pull request #7767 from Mechoid/VentcrawlTweak 
Tweak Ventcrawl To Allow Allowed Items to be Worn
 2020-11-26 13:40:37 -05:00
ShadowLarkens
9a9f0fa9e8 Prevent cyclic neighbor references in spreading plants 
These are kind of a nightmare to GC regardless, but this should at least help prevent hard del hell
 2020-11-25 13:27:25 -08:00
ShadowLarkens
d3044c8739 Merge remote-tracking branch 'upstream/master' into github_actions 2020-11-24 09:56:38 -08:00
Novacat
67fb08e6e2 Merge pull request #9335 from KasparoVy/damn-son-whered-i-find-this 
Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching
 2020-11-23 19:54:17 -05:00
Novacat
80ddfd23be Merge pull request #9349 from Novacat/nova-basicfixes 
More ship and turret fixes
 2020-11-23 17:18:38 -05:00
Unknown
b1f33868ed Deathsquad support 2020-11-23 17:01:38 -05:00
VerySoft
7008be7083 Spellcheck the tummy text 
Thanks Xander <3
 2020-11-23 12:50:09 -05:00
Verkister
3223a0ef99 oops 2020-11-23 01:13:47 +02:00
Verkister
f7df99f041 Fixes digested PDAs dropping IDs on the floor 
Just a little oversight from my recent update.
 2020-11-22 22:49:02 +02:00
ShadowLarkens
87e0b3653f Move away from Travis CI to GitHub Actions 2020-11-21 18:23:40 -08:00
Amy
568f4e42e0 Fixes Proteans not retaining languages in blob form, gives Proteans Feeder ability 2020-11-21 19:50:59 -06:00
KasparoVy
ae8970ab2f Eyes Synth Monitor, Switching Eye Layer Verb 
Everything works, trust me.
 2020-11-21 18:18:23 -05:00
Amy
4af9b020fc It's wrist-mounted actually because that's cooler 2020-11-21 17:12:42 -06:00
KasparoVy
b062575363 Ports Cool Stuff from Bastion of Hestia/Vesta 
Fully implements DNA-integrated secondary & tertiary colouration for ears, wings and tails.

Adds some new ears, wings, tails and markings from Hestia.

Everything working in mint condition

EVERYTHING
 2020-11-21 14:57:44 -05:00
Amy
77527ec516 Moves sizegun module to _vr.dmi 2020-11-21 01:22:46 -06:00
Amy
dae335f93a ACTUALLY finishes up clothes this time, I SWEAR *SOBBING* 2020-11-20 22:23:18 -06:00
Amy
1922255ad3 nikki necklace now only accepts mounted sizegun modules 2020-11-20 22:22:38 -06:00
Novacat
57315d8913 Merge pull request #9330 from Very-Soft/eventystuff 
Eventy stuff and pet protections!
 2020-11-20 12:28:46 -05:00
VerySoft
575a57fa54 adds _vr for rel this time maybe 2020-11-20 12:05:15 -05:00
VerySoft
9923201e5b Adds _vr 2020-11-20 11:58:00 -05:00
Novacat
7f84a6ce06 Merge pull request #9312 from KasparoVy/bird-is-the-word 
Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings
 2020-11-20 10:43:55 -05:00
Novacat
35c172a64f Merge pull request #9329 from Novacat/nova-basicfixes 
Fixes PDA Alert Icons
 2020-11-19 19:53:51 -05:00
Unknown
3b27a27ff9 Fixes PDA Alert Icons 2020-11-19 19:36:09 -05:00
Razgriz
e698a52747 Fixes OOC Escape cancellation 
Problem: Pressing cancel would eject someone from belly anyway.

Solution: Fix code.

I am actually entertained that that this has been around for years and only now someone has actually clicked cancel :P
Also entertained that the following condition has a != operator but not the former.
 2020-11-19 01:39:42 -07:00