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
55,786 Commits 8 Branches 26 Tags
f27bdf1dc49b85dbaa3d7cc03fc2e387ee83ca7d
Commit Graph

26190 Commits

Author SHA1 Message Date
lukevale
f27bdf1dc4 Beakres 
Adds in beakers. Fully working. As long as I didn't fuck up any pathing that is.
 2020-12-17 12:06:36 -06:00
Novacat
a2ab304c3e Merge pull request #9470 from Novacat/nova-basicfixes 
Adds bluespace badge
 2020-12-17 03:13:33 -05:00
Unknown
fb32d9f494 Missing sprite issue 2020-12-16 16:29:38 -05:00
Unknown
95022aa643 Adds a reskinned webbing vest 
Basically a nudity permit with webbing. Adminspawn now, may make it loadout later.
 2020-12-16 16:27:59 -05:00
VerySoft
17024e1599 Adds some extra fun stuff too and final fiddlings 2020-12-15 04:19:46 -05:00
Hatterhat
f771cc4ce5 RPED QoL Tweak(s)/Unimplemented RPED Variant (#7784) 
* this is incredibly scuffed

* this is a monumental W bossman

* parity with downstream

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2020-12-13 19:51:54 -05:00
Verkister
dc051e0da6 Fixes some borgo belly runtimes 
Recycling is only for the modules that have proper material reserves.
 2020-12-12 19:12:42 +02:00
Verkister
8284d5b56f Merge pull request #9444 from H0lySquirr3l/master 
Adds in Astra's approved Fluff item.
 2020-12-12 16:56:49 +02:00
Verkister
baae3e7262 Merge pull request #9442 from Verkister/chunks 
Some taur tweaks
 2020-12-12 16:39:55 +02:00
VerySoft
4e7160ffcd less violent cass 2020-12-11 23:03:36 -05:00
H0lySquirr3l
612c7fc000 Update loadout_fluffitems_vr.dm 2020-12-11 17:13:18 -06:00
H0lySquirr3l
4894dc0eb6 Add files via upload 2020-12-11 17:03:32 -06:00
Verkister
0c07419b56 updoot names 2020-12-12 01:02:07 +02:00
Verkister
141f41cc86 adds 3 color felines 2020-12-12 00:17:28 +02:00
Verkister
b554e85777 Adds tertiary color option to some taurs 
Now wolf, fatwolf, otie, and skunk use the 3 color system.
 2020-12-12 00:08:38 +02:00
Verkister
3c516943b1 skunktaur tweaks 
Tweaks skunktaur sprites for less eyesore and also adds an alt option without underbelly markings
 2020-12-11 23:48:04 +02: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