cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 14:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,714 Commits 8 Branches 26 Tags
7e314656b62ee5516c2d8bd304cfb90583fa359e
Commit Graph

11360 Commits

Author SHA1 Message Date
Sharkmare
7e314656b6 Shadekin Trait apply bugfix 
Apparently, I somehow missed this
 2021-03-09 23:21:32 +01:00
Novacat
a6d4617863 Merge pull request #9884 from VOREStation/upstream-merge-7954 
[MIRROR] Chirp chirp
 2021-03-09 12:30:56 -05:00
Novacat
1c886a605f Update emote.dm 2021-03-09 11:24:25 -05:00
Schnayy
5df83792ac Merge pull request #7954 from PrismaticGynoid/chirpchirp 
Chirp chirp
 2021-03-09 09:49:21 -05:00
Sharkmare
ae25f2ba32 typofix2 
small teeny tiny oversight
 2021-03-09 07:38:40 +01:00
Sharkmare
2e2c01a60f Typofix 2021-03-09 07:34:18 +01:00
Sharkmare
183d89e0b0 Adding the rest of the unarmed attacks 
Overlooked the other default unarmed attacks shadekin get, adding those now.
 2021-03-09 07:29:15 +01:00
Sharkmare
7d89f07776 Update code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2021-03-09 07:27:53 +01: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
Killian
56aceb9f28 Diet/Allergy Rework & Refactor Pt2 2021-03-07 16:10:29 -05:00
Heroman
2937982aca Restricts some size-mechanics with prefs 2021-03-07 06:06:18 +10:00
Cadyn
5e41024696 Add the rest of the allergens 2021-03-04 14:45:10 -08:00
cadyn
24a53a5e75 Make allergen traits make proper use of bitflags 
So, there's really no need to even have these exclude each other if you just change the way they apply. Also, this should fix any potential issues with species' default allergens being overridden.
 2021-03-04 13:56:06 -08:00
Heroman
48a5b080e2 Excludes Proteans from limb-detaching fun 2021-03-04 15:51:51 +10:00
Aronai Sieyes
d434c838d2 Fix shadekin mouse opacity 2021-03-03 18:41:22 -05:00
Novacat
01a9adb562 Merge pull request #9545 from Zap-zapper/master 
[FEATURE] Size Related Content Updates
 2021-03-03 11:06:56 -05:00
Novacat
6cd8392591 Merge pull request #9831 from Novacat/nova-basicfixes 
Adds old teshsneeze as an alternate teshsneeze
 2021-03-02 17:23:44 -05:00
Verkister
b3c4f517fc Fixes custom species body setup jank 
Fixes loading custom species characters in setup not updating the body if the earlier slot was also custom species. This was making a real mess with synth bodies getting slapped onto non-synth character previews and so on.
 2021-03-02 23:45:54 +02:00
Verkister
564fd10478 Fixes V-2 janiborg 2021-03-02 20:33:09 +02:00
Unknown
3056748132 Adds old sneeze as an alternate sneeze 2021-03-01 21:45:28 -05:00
Novacat
c59229fea4 Merge pull request #9825 from Heroman3003/voxanity 
Adds a sanity check for speech sound logic
 2021-03-01 13:08:39 -05:00
Novacat
f5f4622a32 Merge pull request #9822 from Verkister/patch-34 
Fixes pain shock emotes leaking from bellies
 2021-03-01 13:05:47 -05:00
Heroman
9a560d96a1 Adds a sanity check for speech sound logic 2021-03-02 03:58:59 +10:00
Zap-zapper
906366bbf3 Size fetish update 2021-03-02 00:58:26 +07:00
Verkister
e6f50fe3f0 Ports in V-2 janihound model. 
Brings in the janihound version of the big booty valeborgs.
 2021-03-01 19:33:10 +02:00
Verkister
0d755bef99 Fixes pain shock emotes leaking from bellies 
Digesting or otherwise hurt prey will no longer broadcast their agony for the whole room.
 2021-03-01 17:38:08 +02:00
Heroman
ef7157ef93 Adds sanity check to switch eyes layer verb 2021-03-01 17:39:03 +10:00
Meghan-Rossi
5e1d3c52b0 Fix parrot runtime (#7933) 
🆑
bugfix - Fixed a runtime when parrots talk over radios.
/🆑
Tested, seems to work fine.
 2021-02-28 19:12:27 -05:00
Novacat
a64525866f Merge pull request #9802 from VOREStation/upstream-merge-7926 
[MIRROR] Properly cleared ORGAN_CUT_AWAY for prosthetics.
 2021-02-28 18:27:51 -05:00
Novacat
538c805601 Merge pull request #9814 from VOREStation/upstream-merge-7820 
[MIRROR] Adds the Restraining Bolt.
 2021-02-28 18:16:22 -05:00
Unknown
5c28be8c30 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7926 2021-02-28 18:08:41 -05:00
Novacat
827b30c844 Merge pull request #9787 from VOREStation/upstream-merge-7905 
[MIRROR] Added verbs/handling for removing and attaching your own robotic bodyparts.
 2021-02-28 18:07:37 -05:00
Mechoid
f5ade3682c Adds the Restraining Bolt. 2021-02-28 18:04:08 -05:00
Unknown
0f6022040d Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7926 2021-02-28 17:53:22 -05:00
Novacat
c0e283734d Merge pull request #9507 from VOREStation/upstream-merge-7796 
[MIRROR] Adds (Follow) link to emotes for ghosts
 2021-02-28 17:51:45 -05:00
Novacat
85485c41c4 Update emote.dm 2021-02-28 17:40:21 -05:00
Heroman
e9431e7567 Fixes prommies still having trashcan var on by default 2021-03-01 03:52:49 +10:00
Novacat
708308065d Update neutral.dm 2021-02-27 18:42:20 -05:00
Killian
82e99ab778 Update station_vr.dm 2021-02-27 23:38:21 +00:00
Killian
e05436a661 morefix 2021-02-27 23:34:33 +00:00
Killian
3d8b60bc3e Merge remote-tracking branch 'upstream/upstream-merge-7864' into kk-traits 2021-02-27 20:59:29 +00:00
Killian
0a51569694 Merge branch 'master' into kk-misc3 2021-02-27 20:01:52 +00:00
Novacat
e5d50e48ed Update frostfly.dm 2021-02-27 13:13:26 -05:00
MistakeNot4892
3e804dc799 Sideports a couple of init unit tests from Neb. 2021-02-27 13:05:16 -05:00
Novacat
db9968a3ff Merge pull request #9454 from VOREStation/upstream-merge-7783 
[MIRROR] Reworks stairs to be sensible
 2021-02-27 13:02:59 -05:00
TheFurryFeline
c79630baa5 Merge branch 'master' into TFF-Fix_Dem_Stairs 2021-02-27 08:48:08 -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
Novacat
af5812a12a Merge pull request #9793 from Heroman3003/silksong 
Silky, silky webs. Adds Weaver trait, with ability to weave spiderwebs and more!
 2021-02-26 16:41:17 -05:00