cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 05:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,197 Commits 7 Branches 0 Tags
6d51b51abb6be4aadab9247d38b2ea517f11bb12
Commit Graph

1431 Commits

Author SHA1 Message Date
TheGreatKitsune
3c861646bc Fixes for sprites and cleaning up code things 2023-01-30 10:37:39 -06:00
Nadyr
ce16bb0fb9 Merge pull request #5537 from CHOMPStation2/upstream-merge-14325 
[MIRROR] Adds new system for markings that can override whole organs and new Generic Hooves using this system
 2023-01-27 09:05:16 -05:00
Cyrelius
2b447c0cc3 Update sprite_accessories_taur_ch.dm 2023-01-19 19:15:06 -08:00
Heroman3003
99c04723f1 Merge pull request #14325 from Heroman3003/generic-hooves 
Adds new system for markings that can override whole organs and new Generic Hooves using this system
 2023-01-13 21:59:24 +00:00
Heroman3003
091b8b2d31 Merge pull request #14305 from radiantAurora/master 
Extremely quick marking fix
 2023-01-06 21:45:25 +00:00
Nadyr
93e1fd78fa Merge pull request #5500 from CHOMPStation2/upstream-merge-14286 
[MIRROR] New synth-style legs
 2023-01-04 21:33:27 -05:00
Nadyr
853ac1001b powder that makes you say yes 2023-01-04 20:57:13 -05:00
Heroman3003
6d2747740b New synth-style legs 2023-01-03 21:26:10 +00:00
Heroman3003
172513bc9c Merge pull request #14289 from faaaay/color-stalk 
Colourable gazer eyestalks
 2023-01-03 21:24:00 +00:00
Razgriz
a773640cc3 Merge pull request #5448 from Verkister/patch-25 
Fixes vwag fat drake loafing
 2022-12-26 12:28:38 -07:00
Verkister
eb8162f211 Fixes vwag fat drake loafing 2022-12-24 17:38:20 +02:00
Verkister
ca4dcee159 Fixes vwag fat synthfeline loaf offset 
loaf is now in right place again
 2022-12-22 20:10:09 +02:00
Heroman3003
22d5a375fa Merge pull request #14215 from TankTheBirb/scars-and-scar-accessories 
Adds scars and bandages from polaris
 2022-12-20 06:40:18 +00:00
Seris02
75ed10aeac *bruh* it's not an upstream file how high was I 2022-12-17 21:47:15 +08:00
Seris02
8e573430ac sect drone l o a f + sect drone icon improvements 2022-12-17 21:31:37 +08:00
Verkister
3706180db4 A tiny sprinkle of new sprite accessories 
-Adds 3 new markings (forward fangs, further forward fangs, normal eyes)
-Adds 2 new earstyles (floppy goat ears, floppy goat ears with horns)
 2022-12-05 17:42:50 +02:00
Razgriz
343c2757c3 Merge pull request #5316 from Darlantanis/NoncrewTweaks1 
Minor non-crew tweaks 1
 2022-11-25 19:08:58 -07:00
Darlantan
91fc31c6b4 Renames "non-crew" to "outsider," provides external ID 
-Renames "non-crew" to "outsider."
-Provides an external ID to outsiders, allowing PDA use.
-Improves grammar in outsider job description
-Reformats outsider to use a define for the job name, replaces hard-coded uses of "non-crew" with said define.
 2022-11-25 19:56:59 -05:00
Verkister
63d5984298 fixes sergal hair restrictions again 
cursed polaris overrides smh
 2022-11-24 16:30:15 +02:00
Nadyr
3bdae72a37 Merge pull request #5312 from TheGreatKitsune/carbonkin-job-bans 
Fix a pair of carbonkin job bugs
 2022-11-23 18:41:39 -05:00
TheGreatKitsune
20d5657b78 Fix a pair of carbonkin job bugs 2022-11-23 16:56:24 -06:00
Verkister
3ff32d8263 Unrestricts sergal hairstyles 
Lets other species select sergal hairstyles too.
Had a few custom species chars using sergal base for them, but the new iconbase eye fix changed their appearance and I didn't want to choose between different hair and different eyes :v
 2022-11-23 13:40:28 +02:00
Verkister
264bf8240a Fixes 3-color fatfeline and fatwolf taurs 
No more dmi conflict
i'm too burned out to shove the entire loaf update upstreams so if they can't be arsed to port it themselves it's not my problem.
 2022-11-22 14:58:47 +02:00
Nadyr
137b92f376 Merge pull request #5285 from CHOMPStation2/upstream-merge-14102 
[MIRROR] Up ports bug sprites fitting for teshari (Wings, tails and ears)
 2022-11-21 23:41:43 -05:00
Nadyr
49409b6e53 Merge pull request #5294 from CHOMPStation2/upstream-merge-14126 
[MIRROR] Adds a greyscale version of the megamoth wings
 2022-11-21 23:23:40 -05:00
Nadyr
f513ada16a powder that makes you say yes 2022-11-21 23:11:04 -05:00
Casey
e54203ce90 Merge pull request #14126 from faaaay/real-moth-hours 
Adds a greyscale version of the megamoth wings
 2022-11-21 19:43:14 +00:00
Heroman3003
5d974d17c3 Merge pull request #14106 from TheRiverStigs/theriverstigs 
spidaurs
 2022-11-21 04:34:07 +00:00
Casey
1af8630323 Up ports bug sprites fitting for teshari (Wings, tails and ears) 2022-11-21 01:33:10 +00:00
Nadyr
bb8d0a1b16 powder that makes you say yes 2022-11-13 16:45:39 -05:00
Casey
9057a53fd3 Adds sect drone taurhalves and wvag versions of existing fat taurs 2022-11-13 20:46:44 +00:00
Razgriz
94bdb1ed00 Merge pull request #5246 from Verkister/sprotstuff 
A small bundle of sprite accessory things
 2022-11-09 12:26:27 -07:00
Verkister
9c7ce66802 fixes loafing for waggy fatfeline 
honestly these two should be feline subtypes like the rest of the feline related taurs are.
 2022-11-09 19:55:03 +02:00
Verkister
79d9e11bf2 Update sprite_accessories_ear_ch.dm 2022-11-09 15:42:37 +02:00
Verkister
d8a93c99ab A small bundle of sprite accessory things 
-Adds markings for thick neck (2 sizes and extra for throat coloring)
-Adds colorable versions of the troll horns that were never useful for anything else due to forced color.
-Fixes elf ears missing sprites (todo: upstream pr if i can be arsed to)
-Improves humanoid round gut marking shading contrast. (I was legit surprised that it even had any in the first place. always thought it was just flat while lmao)
 2022-11-09 15:35:32 +02:00
Nadyr
ee2fa1d961 powder that makes you say yes 2022-11-07 17:25:15 -05:00
Casey
6318dd5b6e Removes crab claws, fixes belly tattoo 2022-11-06 16:56:39 +00:00
Nadyr
815d31def1 Merge branch 'master' into upstream-merge-14014 2022-10-30 16:33:58 -04:00
Casey
6f61eb8652 Adds arm-wings wings and crab claws marking 2022-10-30 15:27:24 +00:00
Heroman3003
4f077ba35f Merge pull request #14011 from TankTheBirb/tesh-beak-2 
Tesh beak addition part 2: resolving conflicts
 2022-10-30 08:08:54 +00:00
Nadyr
c64c5a3443 Merge pull request #5205 from Verkister/moreloaf 
Some improved loafing.
 2022-10-29 19:09:12 -04:00
Nadyr
d77e4f84cb Merge pull request #3877 from TheGreatKitsune/non-crew-role 
Non crew role added
 2022-10-29 19:08:16 -04:00
Nadyr
c8f902a5c1 powder that makes you say yes 2022-10-29 18:28:19 -04:00
Verkister
f9f1034d52 fatwolf marking fixy 2022-10-29 23:24:26 +03:00
Verkister
a19f984335 Update sprite_accessories_taur_vr.dm 2022-10-29 14:25:58 +03:00
Verkister
4d006553f4 Some improved loafing. 
Made some more properly positioned loaf sprites for some of the taurs from the previous batch that didn't look loafy enough.
Also fixed the drake loaf sprites not following the hand/arm silhouettes.
 2022-10-29 14:23:57 +03:00
Heroman3003
802b6734bd Adds Perrin's fluff stuff 2022-10-29 06:20:16 +00:00
Verkister
9368954cfa enables fatdrake too. uses same loaf sprites as regular tho 2022-10-26 18:59:24 +03:00
Verkister
65d00b0bea Taur loaf update Batch 1. 
Updates taur loafing to work in a more appropriate way.
Also adds loafing ability to a whole bunch of new taurs. This batch adding most of the legged upstream taurs.
Even better loafing sprites with more varying offsets and all might happen but these will do for now.
Also ported the updated drake loaf sprite that hadn't been ported before.
Upstreams will probably port this sooner or later so I didn't feel like playing perfectionist with chompedit comments on every taur
 2022-10-26 18:49:04 +03:00
Nadyr
7f54c2b89b Merge pull request #5174 from CHOMPStation2/upstream-merge-13967 
[MIRROR] Adds mantis arm wing things
 2022-10-24 17:03:40 -04:00