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
77,835 Commits 6 Branches 0 Tags
e28fa967056cf1c43cb708cc6ec7f30a5ddad25c
Commit Graph

424 Commits

Author SHA1 Message Date
Selis
e1a987c25c Configuration Controller (#7857) 2024-04-05 07:44:20 +02:00
Cadyn
ccad338c93 Tgpanel (#8007) 
Co-authored-by: ItsSelis <selis@xynolabs.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-03-24 12:19:07 +01:00
Cadyn
b90f7ec922 The 515 MegaPR early downport (#7783) 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
 2024-02-27 20:17:32 +01:00
Aroliacue
40e6091f25 Bluespace Fultons, Surgical Bags in Cargo and misc changes (#7586) 2024-01-21 03:28:23 -05:00
Selis
2ba38d60af [MIRROR-FIX] Upstream merge 15464 (#7176) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
 2023-11-07 13:33:44 +01:00
CHOMPStation2
50010386ac [MIRROR] Fixes human mobs ending up with their blood datums deleted, creates fallback if that still happens (#6837) 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
 2023-08-19 08:06:23 +02: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
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
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
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
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
a993b670fe powder that makes you say yes 2022-09-10 22:02:24 -04: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
Novacat
a6bac4271c Merge pull request #13471 from lm40/master 
Makes wounds disappear
 2022-08-11 00:10:41 +00:00
Nadyr
eae946fdb8 powder that makes you say yes 2022-07-11 21:05:35 -04:00
Casey
26dce1db7b Mouse Ray 2022-07-08 00:32:36 +00:00
Razgriz
e18c0203b5 Merge pull request #3913 from Rykka-Stormheart/shep-dev-tankiness-buff 
Trait Addition + Adjustments (Tankiness++)
 2022-03-29 14:48:35 -07:00
Casey
80758e4374 Auto-Resleeving 2022-03-25 07:22:13 +00:00
Rykka
404750da46 Increases High Endurance cost to 3, VHE to 6, and adds EHE for 9 
Also adjusts organ break damage across the board.

Unathi are TANKY BOIS.
80 damage to break their chest/groin compared to 60 on most, and 70 for head, compared to 50 for most.
 2022-03-24 14:58:47 -06:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Aronai Sieyes
bc6564deb6 Merge pull request #10335 from VOREStation/Arokha/dels 
Various qdel helpers
 2021-05-20 19:05:42 +00:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Chompstation Bot
1aa9efb728 [MIRROR] Added verbs/handling for removing and attaching your own robotic bodyparts. 2021-02-28 23:08:29 +00:00
Chompstation Bot
018d176c51 [MIRROR] Fresh Meat, Leatherworking 2020-11-08 17:04:32 +00:00
Cadyn
bd2e76e4e8 Cadyn's traits changes part 1 2020-10-22 20:02:21 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
Killian
84128e72ff blood mechanics tweaks (#7377) 2020-07-31 04:54:11 -04:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Atermonera
619e8b1b94 Ported /tg/ style screen alerts, replacing the hunger icon with them 2020-05-31 11:52:17 -04:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai Sieyes
4bfe8412f4 Tweak math to be faster in ext organs 2020-05-16 22:39:13 -04:00
Aronai Sieyes
c0ef0be827 VS: Tweak VS edits to external organs 
Might look like it's removing protection for people in bellies, but that code is old and is checking if they're in a mob. They aren't, they're in a belly obj, so that code hasn't been effective anyway!
 2020-05-16 18:24:54 -04:00
ShadowLarkens
f905cfc020 Ported /tg/ style screen alerts, replacing the hunger icon with them 
This adds throw_alert() and /obj/screen/alert, a system that allows you
to do custom hud alerts for any variety of things from "You're too
cold!" to mecha status indicators for the pilot.

There's quite a few things that actually got replaced; the
fire/oxy/tox/co2 alerts are all now just alerts, as is nutrition. The
xenochimera feral indicator would probably be a good candidate for
conversion, but I didn't touch it in this PR. There's also a number of
new alerts, such as blindness, highness, legcuffed, buckled, handcuffed,
and probably some more I missed; read code/_onclick/hud/alert.dm and see
for yourself!

Additionally, a number of tweaks have been done to resisting code, to
make it so that there's an indicator when you're buckled or handcuffed,
and can just click the alert to start resisting. This includes a
refactor that combines the logic for lockers, holders, micros
escaping from shoes, and struggling in a gut all into one proc, called
container_resist(). This means that vore bellies actually no longer need
the resist override, but it's been left in place just in case someone
finds something else they want to use it for.

Also, the health and internals indicator got moved down one tile each.
Needed room for the alerts. If we add the oxygen tank action buttons
from /tg/ and remove the internals indicator, the health indicator can
go back where it was originally.
 2020-05-13 19:36:01 -07:00
Aronai Sieyes
6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00