Commit Graph

979 Commits

Author SHA1 Message Date
Novacat
b782fed522 Merge pull request #9867 from VOREStation/upstream-merge-7928
[MIRROR] Added a GPS compass.
2021-03-09 17:58:49 -05:00
Novacat
466b0af3b8 Merge pull request #9815 from VOREStation/upstream-merge-7927
[MIRROR] Removes transform from speech bubbles when speaker is scaled at less than 2x.
2021-03-09 17:40:51 -05:00
Unknown
e436ca7b12 Compat fixes 2021-03-09 17:28:24 -05:00
Novacat
bb94127a6f Merge pull request #9881 from Sharkmare/Carbonkin-Content-update
Carbonkin Content port + Trait whitelisting
2021-03-09 11:50:02 -05:00
Schnayy
24435fb1b0 Merge pull request #7849 from Greenjoe12345/teshchair
Adds some new wheelchair types
2021-03-09 01:14:49 -05:00
Sharkmare
d6ea007a37 Removing comments 2021-03-09 07:06:13 +01:00
Sharkmare
3e859092b3 Carbonkin Content port + Trait whitelisting
Ports over my carbonkin content update that brings carbon kin mostly on the same level as mob kin.
Also ports the whitelist system so people dont have to write out EVERY species name in cases like this.

Whats it add tho?
Rebalances phase shifting:
Phase shifting is a pretty polarizing ability, it now is more forgiving for stealth uses but has a counter in becoming more costly with people and light level.

Stat blocks of all kin have been revisedd based on the flavor messages of the mob variants.

Tasers and other electricity sources now affect kin, this is the only immunity being removed and should help with SEC interaction.

Adds a new attack "syhon strike" this is mostly for the aggressive kins, if using syphon strike on hit it will take the damage you dealt and convert it into energy, this only works against carbons as example punching punpun restores around 4 energy

As a last note all of the Shadekin Adaptopn color traits lock your eye color into the respective color. So if you take Red adaption you will be immediatley identifiable as a red adapted kin since your eyes will in fact always be red.
2021-03-09 04:24:01 +01:00
Novacat
dde17fefb2 Merge pull request #9876 from VOREStation/upstream-merge-7953
[MIRROR] Fixed/generalized loadout implants.
2021-03-08 11:52:46 -05:00
Novacat
3d7ccffa0c Update loadout_utility.dm 2021-03-08 11:04:02 -05:00
Atermonera
4db820a2da Fixed/generalized loadout implants. 2021-03-08 02:05:32 -05:00
Heroman
5702604b41 Redoes the PR, adds HYPER suit instead 2021-03-08 10:11:10 +10:00
Atermonera
964714e6ba Added a GPS compass. 2021-03-07 14:16:58 -05:00
Heroman
2ae3f959b3 gives bluespace jumpsuit a loadout cost. 2021-03-07 14:17:53 +10:00
Heroman
ecb982e6e9 Reworks bluespace suit, adds redspace suit 2021-03-07 14:08:25 +10:00
Heroman
de8d93868b Crosses out mime/clown options if you aren't whitelisted for them 2021-03-05 17:08:39 +10:00
Sharkmare
f59ec1b2da Fixing traits left display
Currently, traits left are displayed before the traits left are calculated, resulting in it always displaying max traits.
This addresses this
2021-03-04 17:36:50 +01:00
Novacat
bb92753fe1 Merge pull request #9710 from KillianKirilenko/kk-misc4
Go [Verb] Yourself!
2021-03-03 11:09:25 -05:00
Unknown
098af65aa7 Adds Smuggler PDA Cartridge
-Adds Smuggler PDA Cartridge for adminbus
-Adds Bluespace Badge to loadout
2021-02-28 14:05:46 -05:00
MistakeNot4892
3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Verkister
4ea4eecf28 Steals and fixes a memory leak fix from the freeloaders
-Up-ports a memory leak fix related to preview mannequins.
-Also fixes the forementioned fix breaking fuzzy/sharp previews on setup.
-Also makes the fuzzy/sharp toggle button update the char setup preview.
2021-02-27 12:47:16 +02:00
Killian
81de5d28fa ITEL v2 2021-02-26 22:49:02 +00:00
Killian
687796a37d go verb yourself 2021-02-15 05:33:05 +00:00
Novacat
3d1ec8ce42 Merge pull request #9540 from VOREStation/upstream-merge-7810
[MIRROR] Excised Errant Bay Military Lore
2021-02-13 00:50:25 -05:00
Schnayy
92448560bb Medical Soft/Field Cap 2021-02-12 15:04:06 -05:00
Verkister
039ede55fe Merge pull request #9539 from VOREStation/upstream-merge-7813
[MIRROR] Adds proc to properly update human icon gender
2021-02-10 21:13:52 +02:00
Verkister
e7ad6fbc48 Update 03_body.dm 2021-02-10 12:14:14 +02:00
Killian
016cbb80be tgui character directory tweak 2021-02-10 02:36:05 +00:00
Verkister
b9192e59f2 Merge branch 'master' into tgui_character_directory 2021-02-09 22:18:16 +02:00
Killian
c8e633c7d5 improved trait exclusion logic 2021-02-08 07:28:30 +00:00
Verkister
ac93d0e6cd Fixes the setup button 2021-01-29 20:03:31 +02:00
Verkister
7b1c399a73 Eggy reworks and fixes 2021-01-29 14:55:17 +02:00
Verkister
af25a1b592 New advanced Egg Release mechanics.
-The vore release eggs are no longer reskinned lockers, but storage items that can have their contents either dumped or pulled out, but the stuff can't be put back into a cracked shell.
-A live prey in an egg will have the egg scaled according to their size, and they can get out by resisting.
-Also now items can be egged, either one at a time or all at once. The single item eggs are scaled according to the contained item's size class and take the same amount of storage space as the item itself would.
-Full stuff eggs are a little more lenient on the size and weight, basically for the reason that one prey's full outfit could fit in one backpack sized egg rather than going full macro based on the total weight.
-Also there's a whole bunch of new egg type options and some better looking sprites coming.
-Also the new eggs can be picked up and even trash-eaten.
-The old locker eggs still exist in the code and can be spawned should anyone have a need for one.
2021-01-28 13:34:18 +02:00
H0lySquirr3l
3d58ac9f05 Update loadout_fluffitems_vr.dm 2021-01-25 13:44:09 -06:00
H0lySquirr3l
dbe94eafb6 Update loadout_fluffitems_vr.dm 2021-01-25 13:39:55 -06:00
Schnayy
3eceda5bb3 fixes some sprites, adds a thin blindfold 2021-01-24 19:34:39 -05:00
Heroman
ed7323be21 Should fix the broken species 2021-01-24 18:01:53 +10:00
Heroman
2c4a82f87f Makes most neutral traits available to all species 2021-01-17 11:15:16 +10:00
Ketrai
ffc4dac425 adds pelts
ye
2021-01-10 04:12:53 +01:00
Amy
3752556ceb Fixes mistakes I made adding Verie's fluff items 2021-01-02 21:53:46 -06:00
Cerebulon
4fc2884f9f Excised Errant Bay Military Lore (#7810)
* Filth + Graffiti Fixes

* Excised Bad Lore

* Update filth.dm

why was this here oops i was on master
2021-01-01 00:40:56 -05:00
Atermonera
9f9e29d651 Adds proc to properly update human icon gender 2021-01-01 00:33:30 -05:00
Amy
354eba6ab5 adds fluff skirt outfits to loadout blacklist 2020-12-27 22:19:14 -06:00
VerySoft
92181c24db Harmony fluffstuff
https://forum.vore-station.net/viewtopic.php?f=45&t=1880
https://forum.vore-station.net/viewtopic.php?f=26&t=1881
it not approved yet but for if/when it gets so
2020-12-22 22:06:02 -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
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
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
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
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