cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 21:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,572 Commits 9 Branches 26 Tags
169397be53a8dccd7aa8d2a5c3faa682cb097611
Commit Graph

26120 Commits

Author SHA1 Message Date
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
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
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
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
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
KasparoVy
602c52cf3c SCREW IT THEY'RE ALL ICON_MULTIPLY 2020-11-19 02:21:58 -05:00
KasparoVy
3c65734d01 Makes More Sense 2020-11-18 21:46:21 -05:00
KasparoVy
b17adc6cb9 Alright I swear that's it. 
Scatterbrained af.
 2020-11-18 21:46:20 -05:00
KasparoVy
57143ced9d VRs the Teshari-fitted Spacesuit, Adds Fitted Radsuit 
Done based on discussion in Polaris PRs 7531 & 7740
 2020-11-18 21:46:20 -05:00
KasparoVy
2b3d7ce291 It's All VR - Fixes Pathing & Comments, Adds Downstream Undercoat Resprites 
That's all folks.

The updated teshari_uniform.dmi is coing to be straight up copy pasta'd to Polaris
Also moves Teshari aerogel goggles to non _vr file since that's going to Polaris
 2020-11-18 21:46:20 -05:00
KasparoVy
15b09236e3 Ports a Boatload of Teshari Customization from CitRP, Chomp & YW 
All changes to eyes, gloves, suit and ties.dmi are due to be ported upstream to Polaris
The orange goggles are going to be ported to Polaris

Adds Teshari-fitted collar sprites
Adds Teshari-fitted sleek orange goggles
Adds Teshari-fitted rings
Adds better Teshari-fitted Space Suit & Helmet sprites
Adds full sets of Teshari standard & job cloaks from CitRP (different sprites than Polaris) - job cloaks can be selected as an option when selected in loadout. Captain, Psych, RD, HoS & HoP cloaks are net-new from CitRP.
Adds the dark retrowave & black + glowing Teshari cloaks from Chomp.
Adds full sets of Teshari standard & job belted cloaks from Chomp.
Adds full set of Teshari belted cloaks from Chomp.
 2020-11-18 21:46:19 -05:00
Novacat
616910170a Merge pull request #9301 from Jwguy/FoodAdds 
Adding New Foods
 2020-11-18 20:27:53 -05:00
Unknown
7bc77c6740 Does this a bit more cleanly. 2020-11-18 19:48:24 -05:00
Unknown
7d609537da Removes Self-Surgery Toggle 
By staff request. It is largely agreed upon by staff that allowing players to enable self-surgery will just encourage more "i can avoid medbay" behavior which we are wanting to avoid.

It can still be enabled by var-edit but that is it.
 2020-11-18 19:46:21 -05:00
Novacat
4cbf8655f0 Merge pull request #9322 from VOREStation/upstream-merge-7671 
[MIRROR] Self-Surgery
 2020-11-18 17:29:58 -05:00
Novacat
8e53ab6fa9 Update living_defines.dm 2020-11-18 17:15:32 -05:00
Novacat
2812ba1163 Update living_defines.dm 2020-11-18 17:15:16 -05:00
Atermonera
02e7326aa0 Merge pull request #7759 from Mechoid/FixOrgansSimplemob 
Fix Simplemob+ Organs
 2020-11-18 16:58:47 -05:00
Mechoid
9cc7d641b2 Self-Surgery 2020-11-18 16:57:32 -05:00
Verkister
2ad8cff065 Merge pull request #9319 from VOREStation/Verkister-patch-6 
Fixes flavor double post on vore
 2020-11-18 00:05:36 +02:00
Verkister
6ec9c2ebb5 Fixes flavor double post on vore 
The flavor message is already handled by the belly obj Entered proc, so having it in the ingestion proc as well is kinda redundant.
 2020-11-17 14:46:55 +02:00
Verkister
2bf5229f8e Fixes hotkey emotes not getting the proper textbox 
Now we can have both, textbox and typing indicator bubble.
 2020-11-17 14:05:35 +02:00
Verkister
77128a477e Fixes maintpred hyperspeed. 
Memes are fun but this event is not supposed to be about those.
 2020-11-16 03:00:51 +02:00
Verkister
d95709b464 Fixes pixel shifting breaking offsets 
Fixes pixel shifting breaking offsets for wide mobs by resetting into hard 0 rather than the mob's defined default offset.
 2020-11-15 20:49:54 +02:00
Verkister
02a3fe1a09 Merge pull request #9298 from Tenryumi/piper-hair 
Adds Crescent-Moon Hair by Piperboobear
 2020-11-15 10:45:31 +02:00
KasparoVy
61f6aa3a12 Woops, This was Missing 2020-11-14 21:04:16 -05:00