cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-29 10:42:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
67,944 Commits 12 Branches 0 Tags
22d7e1b856f650ca7053475351b69bb63149914d
Commit Graph

13213 Commits

Author SHA1 Message Date
Casey
b83034829f Merge pull request #12173 from KillianKirilenko/kk-test 
Allergen Reaction Tuning
 2022-02-07 23:17:12 +00:00
Casey
81be0362a3 Merge pull request #12161 from KillianKirilenko/kk-test 
Allergy Rebuff
 2022-02-06 23:11:19 +00:00
Nadyr
4fb570d22f Merge pull request #3602 from CHOMPStation2/upstream-merge-12140 
[MIRROR] Startreader Stunlocks Begone
 2022-02-03 22:45:14 -05:00
Casey
daa703ac73 Merge pull request #12140 from KillianKirilenko/kk-test 
Startreader Stunlocks Begone
 2022-02-01 19:49:49 +00:00
Cyrelius
008bf33299 Merge branch 'CHOMPStation2:master' into master 2022-01-29 16:38:44 -08:00
Nadyr
b9538b2b67 Merge pull request #3590 from CHOMPStation2/upstream-merge-12100 
[MIRROR] Makes vulpkanin ingame lore match our actual lore
 2022-01-29 17:31:11 -05:00
Nadyr
27dd908ddf Merge pull request #3596 from CHOMPStation2/upstream-merge-12124 
[MIRROR] Removes Polaris whitelists from certain sprite accessories
 2022-01-29 17:21:50 -05:00
Nadyr
663cb32830 Merge pull request #3595 from CHOMPStation2/upstream-merge-12118 
[MIRROR] Eyeglow Toggle
 2022-01-29 17:20:40 -05:00
Nadyr
a0095e8b27 Merge pull request #3589 from CHOMPStation2/upstream-merge-12079 
[MIRROR] Buffs speed of protean blobs
 2022-01-29 17:19:49 -05:00
Nadyr
8d547c7de5 powder that makes you say yes 2022-01-29 17:16:03 -05:00
Nadyr
aa9460d198 powder that makes you say yes 2022-01-29 17:10:48 -05:00
Nadyr
656b477d19 Merge pull request #3203 from BlackMajor/cit-mobs 
Porting a hefty chunk of Citadel mobs.
 2022-01-29 17:09:18 -05:00
Casey
bc7ca17c08 Merge pull request #12124 from Heroman3003/unwhitelist 
Removes Polaris whitelists from certain sprite accessories
 2022-01-28 22:27:32 +00:00
Casey
975fd10ba4 Merge pull request #12118 from KillianKirilenko/kk-test 
Eyeglow Toggle
 2022-01-28 22:25:18 +00:00
Casey
69a01d84eb Makes vulpkanin ingame lore match our actual lore 2022-01-28 22:20:21 +00:00
Casey
fd0dae8cbf Buffs speed of protean blobs 2022-01-28 22:19:08 +00:00
Novacat
ce607b7305 Merge pull request #12085 from Heroman3003/rulemaker-taur 
Adds Rat taurhalf
 2022-01-23 15:08:19 +00:00
Novacat
d6a8ecf3d6 Merge pull request #12090 from Heroman3003/robot-iconfix 
Fixes robot icon breaking when canceling during sprite selection
 2022-01-22 14:17:35 +00:00
Rykka
4232a8e1cf Adds missing ChompEdits 2022-01-20 16:06:23 -08:00
Cyrelius
d4587c2702 Update drone_items.dm 
missed a line
 2022-01-17 12:38:34 -08:00
Cyrelius
8797d8779f Update drone_items.dm 
Removes toxins capability, reconsidered, it was probably too much.
 2022-01-17 12:37:47 -08:00
Cyrelius
b05944aa30 Merge branch 'CHOMPStation2:master' into master 2022-01-17 12:29:04 -08:00
Cyrelius
bd96d5dbad Update station_vr.dm 
Add tags that were forgotten.
 2022-01-17 12:27:15 -08:00
Cyrelius
29d09badc2 Update station_vr.dm 
Adds the same phase weapon to the Kmine.
Adds a slime taser and slime baton to the sci-borg.
 2022-01-17 12:25:28 -08:00
Cyrelius
b7607a155b Update station.dm 
Puts a phase weapon on the mining borg.
 2022-01-17 12:12:24 -08:00
Cyrelius
3aaa66dd9e Update drone_items.dm 
Add toxins capablity to the science gripper, and nif handling to the medical one.
Open to suggestions of more.
 2022-01-17 11:55:34 -08:00
Rykka
e8a55485a1 Enables all metabolism types for all species 
Fast, Slow, Apex, and Singularity metabolisms are now available for all species/characters irregardless of if custom species or not.

This shouldn't affect gameplay balance in any way, EXCEPT potentially on 'chimera - therefore it's advised that, as with the Neural Hypersensitivity trait for Xenochimera, you do not take it unless you understand what you're doing and WILL play around it.

Singularity Metabolism was renamed Metabolism, Singularity in the trait display list to line up better with the other metabolism traits.
 2022-01-17 04:56:51 -08:00
Nadyr
67fb13df34 Merge pull request #3538 from CHOMPStation2/upstream-merge-12021 
[MIRROR] Adds more absorbs-related vore messages and rearranges vore panel a bit
 2022-01-09 21:29:27 -05:00
Nadyr
746548e3cf Merge pull request #3522 from CHOMPStation2/upstream-merge-12047 
[MIRROR] Makes Vox and Zaddat capable of breathing and not dying when in stomachs
 2022-01-09 21:04:24 -05:00
Nadyr
f4ad4ec873 Merge pull request #3521 from CHOMPStation2/upstream-merge-12048 
[MIRROR] Fixes riding offsets not counting rider size
 2022-01-09 20:53:39 -05:00
Nadyr
42f8adc2a4 powder that makes you say yes 2022-01-09 20:52:42 -05:00
Nadyr
8a88165f57 Merge pull request #3529 from CHOMPStation2/upstream-merge-12035 
[MIRROR] Adds secondary color layer to neckfur "wings"
 2022-01-09 20:21:47 -05:00
Nadyr
8365029d00 Merge pull request #3535 from CHOMPStation2/upstream-merge-12026 
[MIRROR] [MIRROR] Adds checking on target to mob shoot_target proc.
 2022-01-09 20:11:45 -05:00
Casey
0495d7ab40 Adds more absorbs-related vore messages and rearranges vore panel a bit 2022-01-09 01:51:49 +00:00
Casey
b885622729 Merge pull request #12026 from VOREStation/upstream-merge-8361 
[MIRROR] Adds checking on target to mob shoot_target proc.
 2022-01-09 01:51:25 +00:00
Casey
479131e9f1 Merge pull request #12035 from Verkister/neckfluf 
Adds secondary color layer to neckfur "wings"
 2022-01-09 01:50:36 +00:00
Casey
fc8544e497 Makes Vox and Zaddat capable of breathing and not dying when in stomachs 2022-01-09 01:49:38 +00:00
Casey
8ae533e3f1 Merge pull request #12048 from Verkister/ponyshow2 
Fixes riding offsets not counting rider size
 2022-01-09 01:49:29 +00:00
radiantAurora
770e239b61 Update sprite_accessories_ear_ch.dm 2022-01-04 23:04:09 +00:00
Razgriz
5ca57a4e08 Merge pull request #3512 from Verkister/honkborg 
Adds Honk-Hound
 2021-12-30 22:55:31 -07:00
Verkister
0014d6a6e6 Adds Honk-Hound 
Absolutely cursed in all the right ways~

Also fixed the regular confetti cannon's flaccid throwing performance while at it.
 2021-12-31 02:40:35 +02:00
Verkister
94e7e26dd9 Fixes some teppi belly loading runtimes 
Fixes some teppi runtimes related to unloaded vorgans.
 2021-12-30 21:47:31 +02:00
Nadyr
ef863e5e65 Remove Squeakish 2021-12-28 12:57:28 -05:00
Verkister
5edd91b4e6 Buffs simplemob leap ability 
Makes the ability somewhat viable again by swapping the old virgo balance number to match the borgo leap chance. A hardly useful scene ability failing 8 times in a row is just cringe.
 2021-12-27 14:13:50 +02:00
Nadyr
271d4ee4db Merge pull request #3496 from Sharkmare/master 
Teshari Large Heterochromia
 2021-12-15 19:43:44 -05:00
Nadyr
5dfdd799cd Merge pull request #3490 from Verkister/patch-66 
Fixes handy mobs not getting nutrition heal verb
 2021-12-14 19:59:26 -05:00
Sharkmare
b26797ff87 Teshari Large Heterochromia 
Adds an accompanying heterochromatic marking for the large teshari eye variant
 2021-12-14 11:29:39 +01:00
BlackMajor
6b4ccac9db many more fixes 2021-12-14 02:22:21 +13:00
Nadyr
96a2994f66 Merge pull request #3262 from CHOMPStation2/upstream-merge-11952 
[MIRROR] Makes proteans gib on death
 2021-12-12 06:41:42 -05:00
Nadyr
ed5128abf5 Merge pull request #3482 from CHOMPStation2/upstream-merge-11993 
[MIRROR] Fixes Elf Ears being restricted to human and event species
 2021-12-12 06:38:59 -05:00