cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 20:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,716 Commits 8 Branches 26 Tags
4e7160ffcdfc046b0da4e47f39d8158ac614ae72
Commit Graph

26175 Commits

Author SHA1 Message Date
VerySoft
4e7160ffcd less violent cass 2020-12-11 23:03:36 -05:00
Verkister
0a35110191 Merge pull request #9438 from Tenryumi/verie-fluff-stuff 
Adds Verie's fluff items + framework for hair accessories
 2020-12-11 14:12:06 +02:00
Amy
7a9b23005d Cleans up debug messages, prepares for delivery! 2020-12-08 19:33:12 -06:00
Amy
aa6434b455 it all works now 2020-12-08 19:15:48 -06:00
Unknown
5d630a0844 Makes Sleepypen not lethal 2020-12-08 15:40:26 -05:00
Novacat
162d018f97 Merge pull request #9431 from Very-Soft/abduct-u 
Abductor Ship
 2020-12-08 13:55:41 -05:00
VerySoft
ff2fb7069e Abduct-u 2020-12-08 13:10:27 -05:00
Novacat
47c4b5f66e Merge pull request #9422 from VOREStation/upstream-merge-7762 
[MIRROR] Plainleather & Tobacco
 2020-12-07 22:37:38 -05:00
Novacat
e9ff27d7cc Merge pull request #9426 from VOREStation/upstream-merge-7774 
[MIRROR] Prevents infinite money
 2020-12-07 22:34:49 -05:00
Atermonera
c449e9613b Merge pull request #7774 from Shadow-Quill/patch-1 
Prevents infinite money
 2020-12-07 20:09:23 -05:00
Atermonera
153eadeb0f Merge pull request #7773 from Verkister/patch-56 
Fixes unreachable landmarks breaking spacetravel
 2020-12-07 20:07:54 -05:00
Mechoid
b95a10af1a Plainleather & Tobacco (#7762) 
* Rebrands leather to plainleather. Add tobacco and red-caps, redwood tallcaps.

* Seedpacket

* Sinks are wet.

* User
 2020-12-07 19:50:50 -05:00
Hatterhat
7ed50074aa polaris#7778 earlyport 2020-12-07 01:34:32 -06:00
Amy
e48fcf4ae6 oh, it's because THEY were reading the instructions and I wasn't 2020-12-06 01:11:43 -06:00
Amy
e715d8ae34 no idea why TARGETED_LAYER and TOTAL_LAYERS were the same value despite the instructions, but I'd rather not break anything, so here 2020-12-06 00:10:36 -06:00
Amy
d25d0fc35c it probably works but can't read the icon. why?? 2020-12-06 00:06:24 -06:00
Amy
19a2a70175 begins adding Verie's hair brush and a framework to support hair accessories 2020-12-05 20:54:01 -06:00
Amy
3e11834cc8 Adds Verie's jumpsuit and hoodie 2020-12-05 20:52:30 -06:00
Verkister
72b5b28caf Fixes proteans losing languages when un-blobbing 
Blobform now copies the language list so it doesn't just get deleted with the blob.
 2020-12-05 12:13:43 +02:00
Novacat
39fe761eee Merge pull request #9394 from VOREStation/upstream-merge-7760 
[MIRROR] Adds & Upgrades a Bunch of Teshari Clothing
 2020-12-04 15:06:38 -05:00
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
KasparoVy
fa1c991994 Reverts Most of #9312, Fixes #9394 
Reverts the VR_edit versions of the clothes in PR #9312 and brings Teshari clothing in compliance with Polaris upstream
 2020-12-03 22:40:02 -05: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
KasparoVv
0d6e6f87b2 Adds & Upgrades a Bunch of Teshari Clothing 2020-12-02 02:30:07 -05: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