cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,760 Commits 7 Branches 0 Tags
014ea7a0c4eba3a339ed423fb4b64a74e2bb7272
Commit Graph

32997 Commits

Author SHA1 Message Date
Mysterijojo
014ea7a0c4 ... forgot the tails. 
Forgot to split the tails.
 2022-08-21 12:04:51 -07:00
Mysterijojo
0c209034fe Separated new markings into /modular_chomp 
Hopefully reverted most the changes to /code, and ported them to /modular_chomp.
 2022-08-21 12:01:15 -07:00
Mysterijojo
e9ed37adb5 Sect drone bodytype marking 
Introduced sect drone bodytype markings, with appropriate wings and tail.
 2022-08-18 06:56:47 -07:00
Mysterijojo
f088770c05 Tyranid markings now under digitigrade 
Should've been done ealier. Leg shape after all.
 2022-08-18 03:41:26 -07:00
Mysterijojo
906c47537e tyranid body marking 
Tyranid bodytype marking split in separably colorable body, armor, and tail.
 2022-08-18 01:55:40 -07:00
Mysterijojo
02e19e6c2b Correctly moved virus markings 
Moved markings from markings.dmi, tails.dmi, and taurs.dmi to markings_ch.dmi, tails_ch.dmi, and taurs_ch.dmi

Moved altered code to modular_chomp folder
 2022-08-17 21:24:08 -07:00
Mysterijojo
9db13dd17a Bacteriophage markings and hide_body_part flags for markings. 
Added bacteriophage markings in both full virus and anthropomorphic types, as well as a normal and taur tail.

'hide_body_part' now applies to body markings if set.
 2022-08-17 07:00:03 -07:00
BlackMajor
92273eda8b Merge branch 'master' into upstream-merge-13514 2022-08-16 13:28:46 +12:00
C.L
04373c83c3 Sanitization Pt 2 2022-08-16 01:15:11 +00:00
Novacat
4a4dc3da05 Merge pull request #13513 from Cameron653/JANITOR_SANITIZATION 
Janitorial Sanitization update
 2022-08-16 00:40:58 +00:00
Razgriz
f605f92d37 Merge pull request #4616 from CHOMPStation2/upstream-merge-13399 
[MIRROR] Expands Server Status Info
 2022-08-14 15:29:38 -07:00
Nadyr
8f83c4a018 Merge pull request #4707 from CHOMPStation2/upstream-merge-13490 
[MIRROR] Makes brainzsnax actually snacks
 2022-08-14 17:47:27 -04:00
Nadyr
631ae2acf1 Merge pull request #4705 from CHOMPStation2/upstream-merge-13495 
[MIRROR] Fixes IDs getting the "digested" overlay up to infinity
 2022-08-14 17:46:01 -04:00
Nadyr
03d01a3b56 Merge pull request #4704 from CHOMPStation2/upstream-merge-13496 
[MIRROR] Adds ""Bits and Bobs"" EGY and Schnapsen to vending machines
 2022-08-14 17:45:21 -04:00
Nadyr
e8fb5c47de Merge pull request #4687 from Rykka-Stormheart/shep-dev-taur-loafing 
Ports Taur Loafing from Cit-RP
 2022-08-14 17:43:00 -04:00
Nadyr
7cde3fc4f5 Merge pull request #4700 from CHOMPStation2/upstream-merge-13481 
[MIRROR] Medsensor borgs can analyze patients in their belly.
 2022-08-14 17:40:48 -04:00
Nadyr
873e975ad7 Merge pull request #4688 from CHOMPStation2/upstream-merge-13466 
[MIRROR] [Ready for Review] Surgery hound
 2022-08-14 17:38:11 -04:00
Nadyr
546220c711 Merge pull request #4695 from CHOMPStation2/upstream-merge-13480 
[MIRROR] Fixes wrong target recieving message of catslug feeding
 2022-08-14 17:33:27 -04:00
Nadyr
c5fa4dea56 Merge pull request #4693 from CHOMPStation2/upstream-merge-13472 
[MIRROR] Enables unbuttoning the Command Dress Jacket
 2022-08-14 17:31:26 -04:00
Nadyr
dc1701ae71 Merge pull request #4692 from CHOMPStation2/upstream-merge-13476 
[MIRROR] LEMME SUCC
 2022-08-14 17:30:44 -04:00
Nadyr
abf0eb5360 Merge pull request #4689 from CHOMPStation2/upstream-merge-13470 
[MIRROR] Adds sugar to appleberry bits
 2022-08-14 17:28:19 -04:00
Rykka
89be15df25 Adds missed comments 2022-08-14 15:26:44 -06:00
Nadyr
8f10ac1c1a Merge pull request #4684 from CHOMPStation2/upstream-merge-13442 
[MIRROR] [READY] Adds Altevian species
 2022-08-14 17:18:49 -04:00
Nadyr
812e09809d powder that makes you say yes 2022-08-14 17:00:53 -04:00
Nadyr
2f6f22cff0 powder that makes you say yes 2022-08-14 16:49:05 -04:00
Nadyr
6bba47fe46 powder that makes you say yes 2022-08-14 16:46:39 -04:00
Nadyr
93cfb1bef8 powder that makes you say yes 2022-08-14 16:45:52 -04:00
Nadyr
4ef61f9bf4 powder that makes you say yes 2022-08-14 16:40:53 -04:00
Nadyr
2402845546 powder that makes you say yes 2022-08-14 16:38:44 -04:00
Casey
660e9df072 Merge pull request #13490 from Screemonster/pickupthatcan 
Makes brainzsnax actually snacks
 2022-08-14 20:38:24 +00:00
Casey
9be785c4ae Merge pull request #13495 from ItsSelis/id-digested-overlay-fix 
Fixes IDs getting the "digested" overlay up to infinity
 2022-08-14 19:13:39 +00:00
Casey
5f21619665 Merge pull request #13496 from Runa-Dacino/schnapsen_vending 
Adds ""Bits and Bobs"" EGY and Schnapsen to vending machines
 2022-08-14 19:13:35 +00:00
Razgriz
2f41255383 powder that makes you say yes 2022-08-13 23:01:36 -07:00
Razgriz
b047830f5d powder that makes you say yes 2022-08-13 22:52:03 -07:00
Casey
7c14ff49b8 Merge pull request #13481 from Cameron653/MED_BELLY_ANALYZER 
Medsensor borgs can analyze patients in their belly.
 2022-08-14 05:44:55 +00:00
Casey
4a16e586b4 Merge pull request #13480 from Heroman3003/catslug-pronoun 
Fixes wrong target recieving message of catslug feeding
 2022-08-14 05:43:30 +00:00
Casey
490e0a4d67 Merge pull request #13472 from Runa-Dacino/command-jacket-open 
Enables unbuttoning the Command Dress Jacket
 2022-08-14 05:40:16 +00:00
Casey
73eafa0b85 Merge pull request #13476 from TankTheBirb/Borg-SUCC 
LEMME SUCC
 2022-08-14 05:40:12 +00:00
Casey
812757bd38 Merge pull request #13470 from Runa-Dacino/Appleberry-bits-nutrient-adjustment 
Adds sugar to appleberry bits
 2022-08-14 05:38:57 +00:00
Casey
a53bd2b817 [Ready for Review] Surgery hound 2022-08-14 05:37:50 +00:00
Rykka
8e8232c0d8 Ports Taur Loafing from Cit-RP 
Ports https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/2950

Doesn't work for sleeping *yet* due to some fuckiness with sprites updating that I'll probably actually work on properly later.
Does work for resting, and when you're stunned/knocked over/etc you will tip upwards like normal as a visual indicator that you're fucked (until we get fancy on-side sprites or smth).

For real tho laying-on-side sprites would be nice to visually represent a taur collapsed on their side, rather than faceplanting bc humancode.

At the very least, despite my frustrations, y'all can rest on your belly now as a taur and transform/size matrixes should work. LMK if there's any issues, my testing didn't find any.
 2022-08-13 18:12:57 -06:00
Razgriz
79465280e1 Merge pull request #4686 from VictorZisthus/adminlog-spam 
Mutes some adminlog spam
 2022-08-13 01:19:56 -07:00
Victor Zisthus
6acf747711 Mutes some adminlog spam 
Title.

We don't want to get pinged with every spell cast, or notified everytime a dogborg vores someone.
 2022-08-12 21:39:10 -04:00
Nadyr
0966850de6 powder that makes you say yes 2022-08-12 20:10:37 -04:00
Casey
56b51e8ef2 [READY] Adds Altevian species 2022-08-12 18:05:36 +00:00
Victor Zisthus
03beaa5e33 Fixes Demon Tongues 
They now speak daemon as well as cultish hivemind. They could speak cult, so it only makes sense.

I will bonk anyone with a Durasteel bat if I have to explain why Demons should know Daemon.
 2022-08-11 21:05:21 -04:00
TheGreatKitsune
5f0ed62225 Merge master into vore-sprites 2022-08-07 19:38:53 -05:00
Nadyr
570f5c109b Merge pull request #4672 from CHOMPStation2/upstream-merge-13452 
[MIRROR] shalax fluff wrassle secbelt reskin
 2022-08-07 19:39:16 -04:00
Nadyr
1a1fca7867 Merge pull request #4670 from CHOMPStation2/upstream-merge-13458 
[MIRROR] Allows changing of the release verb when expelling stomach contents.
 2022-08-07 19:38:13 -04:00
Nadyr
604c37f716 Merge pull request #4663 from CHOMPStation2/upstream-merge-13443 
[MIRROR] Allows un-obligate bloodsucker to just drink blood normally
 2022-08-07 19:37:19 -04:00