cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 22:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,138 Commits 13 Branches 0 Tags
400a89c5e7e0d28585d404d8826c499eab4d8321
Commit Graph

28778 Commits

Author SHA1 Message Date
cadyn
400a89c5e7 HTML tag fix 2021-03-06 10:22:02 -08:00
cadyn
9562bb7b17 Quick fixes + Cleanliness 
Got rid of the nasty switch block in the handle_shade and replaced it with two variables set by the traits. Fixed spelling, added ..() to the apply for the shadekin traits so they apply properly. Added a check to make sure players don't spawn with traits their species shouldn't have.
 2021-03-06 10:17:54 -08:00
Sharkmare
546b39a395 Putting whitie and black togehter apparently breaks 
So its a code block of its own
 2021-03-06 17:54:16 +01:00
Sharkmare
70299a1046 Unifying how to check for kin type 
Was checking a string before with color,, now instead we are checking against the ints that are associated with specific vvariables.
 2021-03-06 17:41:21 +01:00
Sharkmare
06d969a967 Species whitelist for traits 
Tunes up the trait system to have a whitelist AND a blacklist so you can choose whichever makes you have to write the lowest amount of code
 2021-03-06 17:23:41 +01:00
Sharkmare
01da72ac5d Accidentally didnt push this change 2021-03-05 08:51:58 +01:00
Sharkmare
36a785a3fc Carbon shadekin Content update 
Adds Shadekin species specific traits to change their eye color adaptation.
Reworks phasing to take into account liight condition and observers
Adds a new attack to shadekin that allows them to drain energy from carbons via attacking (this is for the aggressive boyos)

Each eye type has their own stats just like the mob versions had.

Essentially this update makes carbon shadekin be on par and even better than mob shadekin for most purposes.
As well as giving counterplay to phaseshifting.
 2021-03-05 08:51:20 +01:00
Nadyr
0cd046d8e6 Merge pull request #1485 from CHOMPStationBot/upstream-merge-9845 
[MIRROR] Add %count and %countprey string replacers in belly messages
 2021-03-04 04:22:07 -05:00
Nadyr
ddc8ef59db Merge pull request #1481 from CHOMPStationBot/upstream-merge-9710 
[MIRROR] Go [Verb] Yourself!
 2021-03-04 04:20:19 -05:00
Nadyr
76013057a6 Merge pull request #1480 from CHOMPStationBot/upstream-merge-9545 
[MIRROR] [FEATURE] Size Related Content Updates
 2021-03-04 04:16:23 -05:00
Razgriz
fb2205bc94 Merge pull request #1472 from CHOMPStationBot/upstream-merge-9833 
[MIRROR] Fixes V-2 janiborg
 2021-03-04 02:15:10 -07:00
Nadyr
b65d5764a4 Merge pull request #1478 from CHOMPStationBot/upstream-merge-9841 
[MIRROR] Hopefully fixes ceiling blocker for good.
 2021-03-04 04:09:42 -05:00
Nadyr
c6f3de3516 Merge pull request #1462 from CHOMPStationBot/upstream-merge-9821 
[MIRROR] Adds sanity check to switch eyes layer verb
 2021-03-04 04:02:52 -05:00
Nadyr
8733d44eb3 Merge pull request #1452 from CHOMPStationBot/upstream-merge-9787 
[MIRROR] [MIRROR] Added verbs/handling for removing and attaching your own robotic bodyparts.
 2021-03-04 03:59:38 -05:00
Nadyr
4d1e555114 Merge pull request #1458 from CHOMPStationBot/upstream-merge-9818 
[MIRROR] [MIRROR] Fix parrot runtime
 2021-03-04 03:56:26 -05:00
Nadyr
c735633b12 Merge pull request #1451 from CHOMPStationBot/upstream-merge-9799 
[MIRROR] [MIRROR] Removes ping subsystem that was breaking chat
 2021-03-04 03:54:49 -05:00
Nadyr
a66d37daee Merge pull request #1453 from CHOMPStationBot/upstream-merge-9814 
[MIRROR] [MIRROR] Adds the Restraining Bolt.
 2021-03-04 03:53:12 -05:00
Nadyr
f9fcec33f3 Merge pull request #1449 from CHOMPStationBot/upstream-merge-9768 
[MIRROR] Peacock tails!
 2021-03-04 03:50:18 -05:00
Nadyr
90b1b77021 Update robolimbs.dm 2021-03-04 03:49:38 -05:00
Nadyr
6c2f2193f8 Merge pull request #1483 from CHOMPStationBot/upstream-merge-9846 
[MIRROR] Fix shadekin mouse opacity
 2021-03-04 03:45:58 -05:00
Nadyr
b9d9a37816 Merge pull request #1450 from CHOMPStationBot/upstream-merge-9507 
[MIRROR] [MIRROR] Adds (Follow) link to emotes for ghosts
 2021-03-04 03:39:59 -05:00
Nadyr
ac9591767b Update sprite_accessories_vr.dm 2021-03-04 03:38:30 -05:00
Nadyr
0aec75f78c Merge pull request #1455 from CHOMPStationBot/upstream-merge-9816 
[MIRROR] [MIRROR] Snow no longer goes clang and shovels are more efficient
 2021-03-04 03:36:24 -05:00
Nadyr
1f77af4f9e Merge pull request #1425 from Sharkmare/Demon-magic 
Demons heal from FireLoss
 2021-03-04 03:35:19 -05:00
Nadyr
6a60b6ee1a Merge pull request #1448 from CHOMPStationBot/upstream-merge-9811 
[MIRROR] Fixes prommies still having trashcan var on by default
 2021-03-04 03:34:33 -05:00
Novacat
ea4e1a690f Merge pull request #9845 from VOREStation/Arokha/bellycount 
Add %count and %countprey string replacers in belly messages
 2021-03-04 00:54:11 +00:00
Novacat
6af932e302 Merge pull request #9846 from VOREStation/shadekinopacity 
Fix shadekin mouse opacity
 2021-03-03 23:53:06 +00:00
Novacat
de16303003 Merge pull request #9710 from KillianKirilenko/kk-misc4 
Go [Verb] Yourself!
 2021-03-03 16:09:37 +00:00
Novacat
110dd0e0dc Merge pull request #9545 from Zap-zapper/master 
[FEATURE] Size Related Content Updates
 2021-03-03 16:08:29 +00:00
Novacat
b6553a924c Merge pull request #9841 from Heroman3003/ceilingfix 
Hopefully fixes ceiling blocker for good.
 2021-03-03 14:10:15 +00:00
Razgriz
10ca656d25 Merge branch 'master' into upstream-merge-9833 2021-03-02 18:30:13 -07:00
Razgriz
62bc99b8cd Merge pull request #1470 from CHOMPStationBot/upstream-merge-9829 
[MIRROR] un-nerfs Skrell veymed limbs
 2021-03-02 17:12:18 -07:00
Razgriz
3dc3c2a47c Merge pull request #1466 from CHOMPStationBot/upstream-merge-9825 
[MIRROR] Adds a sanity check for speech sound logic
 2021-03-02 17:11:16 -07:00
Razgriz
ff28a631dc Merge pull request #1465 from CHOMPStationBot/upstream-merge-9822 
[MIRROR] Fixes pain shock emotes leaking from bellies
 2021-03-02 17:11:04 -07:00
Razgriz
09fae96f24 Merge pull request #1464 from CHOMPStationBot/upstream-merge-9824 
[MIRROR] Ports in V-2 janihound model.
 2021-03-02 17:10:39 -07:00
Razgriz
f7963e1710 Merge pull request #1471 from CHOMPStationBot/upstream-merge-9834 
[MIRROR] Fixes runtime spam when using appearance changer.
 2021-03-02 17:09:46 -07:00
Razgriz
fd7379eebc Update station_vr.dm 2021-03-02 17:09:15 -07:00
Razgriz
e069b18a5a Merge pull request #1473 from CHOMPStationBot/upstream-merge-9836 
[MIRROR] Fixes custom species body setup jank
 2021-03-02 17:08:34 -07:00
Razgriz
9475169bd7 Merge pull request #1474 from CHOMPStationBot/upstream-merge-9831 
[MIRROR] Adds old teshsneeze as an alternate teshsneeze
 2021-03-02 17:07:59 -07:00
Novacat
5be7ddc486 Merge pull request #9837 from Novacat/nova-pathfinder 
Earlyports Stair fix from Polaris
 2021-03-02 22:28:01 +00:00
Novacat
beac75502c Merge pull request #9831 from Novacat/nova-basicfixes 
Adds old teshsneeze as an alternate teshsneeze
 2021-03-02 22:23:51 +00:00
Novacat
cc6001ec96 Merge pull request #9836 from Verkister/patch-36 
Fixes custom species body setup jank
 2021-03-02 21:59:21 +00:00
Chompstation Bot
1a458d4bb6 Fixes V-2 janiborg 2021-03-02 19:08:18 +00:00
Novacat
36a775d31a Merge pull request #9834 from Heroman3003/appearance-changer-runtime-fix 
Fixes runtime spam when using appearance changer.
 2021-03-02 19:08:11 +00:00
Novacat
da35ec456a Merge pull request #9829 from Heroman3003/un-nerf-veymed-2 
un-nerfs Skrell veymed limbs
 2021-03-02 18:39:35 +00:00
Novacat
376bfde619 Merge pull request #9825 from Heroman3003/voxanity 
Adds a sanity check for speech sound logic
 2021-03-01 18:09:41 +00:00
Novacat
2406e6d6e0 Merge pull request #9822 from Verkister/patch-34 
Fixes pain shock emotes leaking from bellies
 2021-03-01 18:06:31 +00:00
Novacat
c52f9f39f6 Merge pull request #9824 from Verkister/thiccboi 
Ports in V-2 janihound model.
 2021-03-01 17:43:59 +00:00
Novacat
22ecb97082 Merge pull request #9821 from Heroman3003/Basic 
Adds sanity check to switch eyes layer verb
 2021-03-01 13:50:57 +00:00
Novacat
955d26f52d Merge pull request #9818 from VOREStation/upstream-merge-7933 
[MIRROR] Fix parrot runtime
 2021-03-01 00:25:12 +00:00