Commit Graph

26099 Commits

Author SHA1 Message Date
ShadowLarkens 87e0b3653f Move away from Travis CI to GitHub Actions 2020-11-21 18:23:40 -08: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
KasparoVy 17d7a13bda Ports CitRP Protogen Markings/Robopart, Some Vox Markings, Teshari Markings Ears + Tails
CitRP PR 2390 & 2168

Adds Protogen robohead (based on Ward-Takahashi Spirit) + Monitor states
Adds Protogen markings
Adds Teshari markings
Adds 2 Teshari Ears
Adds 4 Teshari Tails
Renames Basic Teshari Tail
2020-11-14 20:51:01 -05:00
Unknown f6fc13003b Balance fixes and bugfixes
- Adjusts some of the contents of the ERT ship.
- Fixes mercenary coms not working
- Hopefully! Fixes antag coms not working
- Fixes uplinks not deducting telecrystals when things are bought
2020-11-14 12:20:46 -05:00
Novacat 91bf76bc57 Merge pull request #9294 from ArgobargSoup/ArgoFluffWitchHat
Adds the entry for Felina's witch hat to fluff item loadout
2020-11-14 01:52:27 -05:00
Novacat df1b78d14a Merge pull request #8848 from Cyantime/spaceweirdness
Remove gravity from debris field and rogue mining zones
2020-11-14 01:48:41 -05:00
Silver 9a3869d338 Adding New Foods
Adds the Following Foods:
Gigapuddi
Happy Gigapuddi
Angry Gigapuddi
Omurice
Heart Omurice
Face Omurice
Suppermatter
Suppermatter Slice
Exciting Suppermatter
Exciting Suppermatter Slice
Cinnamon Bun

Also adds the following Festive Foods:
Buche de Noel
Turkey
2020-11-13 21:58:33 -06:00
Amy a46bd66c9d Adds new hair, moves hair code to a spot that makes more sense 2020-11-10 22:27:24 -06:00
Amy bab3595ce5 adds Piper's crescent moon hair (still need add sprites) 2020-11-10 21:27:04 -06:00
ArgobargSoup 45d6a36fb0 Adds the entry for Felina's witch hat to fluff item loadout 2020-11-09 22:32:09 -08:00
Verkister 7c94823ae9 Merge pull request #9293 from VOREStation/Verkister-patch-6
Couple little borgo belly tweaks.
2020-11-08 19:28:28 +02:00
Verkister d771a57663 Merge pull request #9288 from VOREStation/upstream-merge-7701
[MIRROR] Adds the Frostbelle
2020-11-08 19:04:32 +02:00
Verkister 0841aacdac Merge pull request #9287 from VOREStation/upstream-merge-7629
[MIRROR] Fresh Meat, Leatherworking
2020-11-08 19:04:02 +02:00
Verkister fcf4ba8492 Couple little borgo belly tweaks.
-Buffs supply satchel item count to 10.
-Adds a new damage multiplier var to adjust digestion damages for future features.

If I could figure out how to upgrade the ui window to tgui I'd also add in buttons to actually adjust those damages and multiplier.
2020-11-08 19:00:01 +02:00
Verkister 5eeb73814d Update organ.dm 2020-11-08 13:41:31 +02:00
Verkister 0fbd3b4bcb Update organ_icon.dm 2020-11-08 13:12:23 +02:00
Verkister 8d5c109be7 Update organ.dm 2020-11-08 13:10:06 +02:00
Verkister 5018df615e Update brain.dm 2020-11-08 13:08:35 +02:00
Verkister 249bc1418b Update simple_mob.dm 2020-11-08 13:07:23 +02:00
Verkister 62011781fc Update living.dm 2020-11-08 13:05:50 +02:00
Verkister f93452e29c Update living_defines.dm 2020-11-08 13:05:11 +02:00
Verkister 86e2670970 Update human_defines.dm 2020-11-08 13:03:54 +02:00
Atermonera 9a596f0e45 Merge pull request #7751 from Greenjoe12345/clothesporting
Ports some clothing from uristcode
2020-11-07 15:32:07 -05:00