cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,945 Commits 6 Branches 0 Tags
4ce45f8cc4a47b475a932e775c84e97bb440f8e7
Commit Graph

1332 Commits

Author SHA1 Message Date
CHOMPStation2
87996570c0 [MIRROR] adds body marking zone customization (#6756) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-08-10 14:32:12 +02:00
Raeschen
45f1f50be0 Merge branch 'master' into technomancer 2023-07-07 19:57:14 +02:00
kcin2001
d821859440 adds CitRP Fbp Sprites as well as some markings for the spectre 2023-07-06 00:29:37 -07:00
Heroman3003
905d26f647 Merge pull request #14921 from Seris02/mirrortransparent 
reworks handling of transparent limbs (manual mirror)
 2023-05-31 08:38:10 +00:00
Bib Bob
f7996e87b8 Makes most implants craftable 2023-04-12 12:26:51 -05:00
Casey
7aa42e6583 Adds 'drone' versions of mercenary mobs. 2023-03-27 04:01:30 +00:00
Razgriz
c057f9f0f8 Merge pull request #5813 from Rykka-Stormheart/shep-dev-barky-noises 
Sound Update: Mob Species Sounds (Gasp/Scream/Pain/Death/Cough/Sneeze)
 2023-03-22 14:32:04 -07:00
HatArchAzel
437520c1c3 ok i think that's everything actually 
hopefully the dmi files for the markings dont overlap with anything oops
 2023-03-15 18:39:55 -08:00
Rykka Stormheart
f8bbb5790d Merge branch 'master' into shep-dev-barky-noises 2023-03-10 01:54:26 -08:00
Casey
2d07a73b6d Adds new unathi horns and new unathi head shape (as a marking) 2023-03-05 21:37:37 +00:00
Rykka Stormheart
da9c38b689 Merge remote-tracking branch 'upstream/master' into shep-dev-barky-noises 2023-03-04 16:01:30 -08:00
Rykka Stormheart
4c1eedaaec Update 2.2 
Changed frequency for pain emotes to play, as per the following;
**In life.dm**
- One at shock stage >= 80, at a 20% chance
- One at shock stage 120 when you're about to black out, at a 40% chance to play
- One at shock stage 150 (60% chance to play)

**In human_organs.dm**
- Having broken ribs will emote pain on a 10% chance.
- Dropping things from your hands will also emote pain (to simulate trying to pick up things with a broken hand being **excruciatingly** painful).

**In pain.dm**
- Custom pain messages (such as "your upper body aches badly) will no longer play pain often *at all*, as they now reduce the chance by a factor of 10
 2023-03-03 04:42:55 -08:00
Cyrelius
11e40e16d8 Merge branch 'CHOMPStation2:master' into Organs 2023-03-02 22:45:46 -08:00
Cyrelius
a7cee8e0fa Makes Promethean limbs less easy to splatter 
We buffed bone breaks so they don't break as easily, and this is Promethean's version of it, but it got forgotten about.
 2023-03-02 22:42:22 -08:00
Rykka Stormheart
2940d67c4d Update 1.0 
Refactors lists into #defines, promptly cries. This part is agony and still worked on.

Simplemobs can play injury sounds as well, selecting a sound based off a global list.
Pain emotes occur based on updatehealth(), with respect to silicons and such.
Pain emotes also occur at a 60% chance on traumatic shock.
Simplemobs can also play death sounds based off the species sounds lists.
Add Mouse, Robotic, Spider, None as options to the voice list.
Fixes runtime/bug with Silicons (borgs) trying to get species var.
 2023-03-01 23:55:19 -08:00
Razgriz
84ab7c421d Merge pull request #4176 from BlackMajor/protean-rework 
Protean rework part 2 (WIP)
 2023-02-27 19:09:14 -07:00
Heroman3003
ebe81811db Merge pull request #14393 from Runa-Dacino/pain-frequency 
Makes cooldown between pain messages a pre-set global preference
 2023-02-25 18:33:49 +00:00
Seris02
9490a5b69c puts dsi prosthetics back to normal in favor of dsi - adaptive skipping icon 2023-02-11 11:48:26 +08:00
Seris02
3cf60e9c19 vanity copy to 2023-02-05 10:58:11 +08:00
BlackMajor
828a5b135f Merge branch 'master' into protean-rework 2023-01-30 00:21:50 +13:00
Nadyr
3b259e189d Merge pull request #5589 from CHOMPStation2/upstream-merge-14355 
[MIRROR] few small fixes and improvements for proteans
 2023-01-27 10:21:37 -05:00
Nadyr
57ae8c01ee Merge pull request #5564 from CHOMPStation2/upstream-merge-14336 
[MIRROR] [MIRROR] Repairing light robotic damage messaging fix
 2023-01-27 10:11:46 -05:00
Nadyr
702ff265f4 Merge pull request #5565 from Seris02/slimedigi 
more digitigrade legs and better handling of said legs' icons
 2023-01-27 09:48:07 -05:00
Nadyr
7d25e70249 Merge branch 'master' into upstream-merge-14336 2023-01-27 09:43:44 -05:00
Nadyr
309889b705 Merge pull request #5558 from CHOMPStation2/upstream-merge-14346 
[MIRROR] Added a white variant of the Zeng-Hu prosthetic, named Glacier.
 2023-01-27 09:42:55 -05:00
Nadyr
5329fa18f1 powder that makes you say yes 2023-01-27 09:30:29 -05:00
Nadyr
43ed184a5c Merge branch 'master' into upstream-merge-14343 2023-01-27 09:19:11 -05:00
Heroman3003
cb32a65c87 few small fixes and improvements for proteans 2023-01-22 01:35:08 +00:00
Seris02
fde97e7e4b modularises the things 2023-01-20 01:42:21 +08:00
Seris02
5c46dc1007 better digitigrade icon handling, protean digi legs, prosthetic digi legs 2023-01-19 20:29:42 +08:00
Heroman3003
092c7025fd [MIRROR] Repairing light robotic damage messaging fix 2023-01-19 03:20:58 +00:00
Heroman3003
b9e647a4a4 Added a white variant of the Zeng-Hu prosthetic, named Glacier. 2023-01-19 02:32:54 +00:00
Heroman3003
47b530c593 Potential "override fail" fix 2023-01-16 07:04:41 +00: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
eb6dbedbbc Merge pull request #14291 from VOREStation/upstream-merge-8867 
[MIRROR] fixes augment implants so you can't spam the fuck out of them
 2023-01-03 06:54:31 +00:00
BlackMajor
f602eb20b4 Merge branch 'master' into protean-rework 2022-12-19 18:27:08 +13:00
Raeschen
98a9921c4f Various Fixes (#5399) 
* modularize digitigrade code

* Hide glasses + tail side layering fix

* pipe unwrench yeet

Co-authored-by: Razgriz <razgriz1032@gmail.com>
 2022-12-17 16:59:20 -07:00
BlackMajor
68773b6696 Merge branch 'master' into protean-rework 2022-10-18 17:44:15 +13:00
Casey
79b149135f Merge pull request #13871 from VOREStation/upstream-merge-8713 
[MIRROR] Morgan Trading prosthetic expansion [READY FOR MERGE]
 2022-10-10 03:07:24 +00:00
BlackMajor
355c1f91b7 Merge branch 'master' into protean-rework 2022-10-01 19:58:22 +13:00
BlackMajor
bb6c77dd57 Total Reassembly 2022-09-19 14:40:29 +12:00
Nadyr
8980ec81f5 Merge pull request #4901 from CHOMPStation2/upstream-merge-13698 
[MIRROR] Makes wounds take time to disappear again to fix bleeding surgery
 2022-09-18 20:21:38 -04:00
BlackMajor
0af27b48f6 Prot EMP fixes 2022-09-16 12:44:16 +12:00
Nadyr
4e8c0f51da Merge pull request #4908 from CHOMPStation2/upstream-merge-13623 
[MIRROR] [MIRROR] Checks the no_clone modifier stored in DNA records as a path
 2022-09-10 22:07:23 -04:00
Nadyr
a993b670fe powder that makes you say yes 2022-09-10 22:02:24 -04:00
Heroman3003
0c95418e2a Merge pull request #13623 from VOREStation/upstream-merge-8696 
[MIRROR] Checks the no_clone modifier stored in DNA records as a path
 2022-09-10 21:03:04 +00:00
Heroman3003
713e0cc95f Merge pull request #13622 from VOREStation/upstream-merge-8697 
[MIRROR] Organs transfer EMPs to their contents
 2022-09-10 21:02:59 +00:00
Casey
207feae563 Makes wounds take time to disappear again to fix bleeding surgery 2022-09-10 20:41:54 +00:00
Razgriz
95896cde05 Revert "[MIRROR] Makes wounds disappear" 2022-09-09 00:38:08 -07:00
Casey
2d6841cee0 Adds neutral trait for synthetics to toggle cosmetic pain messages 2022-09-06 20:02:31 +00:00