cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,091 Commits 5 Branches 0 Tags
dba0bf4304a627d970d895fb7205fbd7245c0f94
Commit Graph

617 Commits

Author SHA1 Message Date
Rykka
1c2111f488 Xenochimera QOL Improvements 
Adds Regenerating + Hatch thrown alerts, similar to stunned/weakened/buckled, and clicking will show the remaining time to revive, or allow you to hatch.
Defibrillators will now apply halloss to Xenochimera and set them feral on revive.
Medscanners will now display if a Xenochimera is regenerating or needs more protein, and if a 'chimera is dead, will warn that they require sedation.
Reconstitution cooldown reduced from 1 hour to 10 minutes.
Regeneration will no longer handle ferality in the middle of it, preventing edge-case *twitches while clearly regenerating.
Regeneration will now have an audible + visible cue that plays on a 2% chance.
Xenochimera have gained the Lick Wounds Verb.
 2022-03-22 08:31:34 -06:00
Rykka
1bde2cdf09 Xenochimera Ferality Reduction while in belly 
Xenochimera will now reduce ferality at a tickrate of 1 per Life tick while inside a belly, same as the hunger reduction if they're full.
They will not experience hallucinations and will get safety messages while inside a belly, as well as the status indicator confirming they're safe even in a lit environment.
 2022-03-10 15:18:19 -07:00
Razgriz
ab494dfe5c Throwing QoL 
Revival of #3047 and #3115
 2022-03-01 01:34:53 -07:00
Razgriz
d4e8d5c0d6 Merge pull request #3721 from CHOMPStation2/upstream-merge-11700 
[MIRROR] [MIRROR] Minor bodytemp warning refactor.
 2022-02-28 22:50:55 -07:00
Nadyr
5682aa2120 powder that makes you say yes 2022-02-19 19:43:34 -05:00
Casey
c94588fd28 Merge pull request #11700 from VOREStation/upstream-merge-8335 
[MIRROR] Minor bodytemp warning refactor.
 2022-02-19 22:12:40 +00:00
Casey
e73d113da0 7914 branch fix 2022-02-19 21:25:16 +00:00
Rykka Stormheart
a0366cd9b6 Revert "[MIRROR] [MIRROR] Throw Mode QoL Tweaks" 2021-09-28 18:16:44 -07:00
Chompstation Bot
adf03713ba [MIRROR] Throw Mode QoL Tweaks 2021-09-27 18:30:42 +00:00
Aronai Sieyes
99d4db145d Merge pull request #11499 from VOREStation/upstream-merge-8233 
[MIRROR] Ports sliding things along tables
 2021-08-26 20:17:48 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Aronai Sieyes
d989caaf41 Merge pull request #11021 from VOREStation/Arokha/nifcraftmenus 
Make nif/crafting menu buttons not be hidden
 2021-07-11 19:14:17 +00:00
Aronai Sieyes
378fd085fc Merge pull request #10953 from VOREStation/Arokha/seccamera 
Fix security cameras showing weird space thing
 2021-07-07 21:15:05 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
lm40
af32042b15 fixes #10700 (#10763) 
* Update human.dm

* Update robot.dm

* Update simple_hud.dm
 2021-06-27 16:10:18 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Novacat
9f13f4e505 Merge pull request #10658 from ShadowLarkens/patch-1 
Just don't print item attack messages on attackby
 2021-06-16 00:47:44 +00:00
Chompstation Bot
0f30402e40 [MIRROR] Portable mapping devices 2021-06-14 18:37:53 +00:00
Novacat
7bce90d577 Merge pull request #10495 from Very-Soft/ghostsandgateways 
Ghosts can only go through the gateway if it's turned on
 2021-05-30 19:00:19 +00:00
Chompstation Bot
e432a9e7ac Add portable mapping devices 2021-05-22 19:26:57 +00:00
Novacat
86ab1a8363 Merge pull request #10303 from VOREStation/Arokha/removeoldnifmenu 
Deprecate NIF statpanel in favor of TGUI
 2021-05-12 17:46:40 +00:00
Chompstation Bot
d7f20396de Personal crafting & Dependencies 2021-05-11 22:43:33 -04:00
Novacat
8e76f33848 Merge pull request #9967 from VOREStation/upstream-merge-7959 
[MIRROR] Examining dark click catcher doesn't show turfs
 2021-03-18 14:38:51 +00:00
Nadyr
0b8fb0dff0 Merge pull request #1490 from Sharkmare/shadekin 
Fixes debug spam on simplemob hands
 2021-03-06 23:32:20 -05:00
Sharkmare
79aa74ee8f Fixes debug spam on simplemob hands 
2 unique cases of simplemob hands causimg debug spam just because they are not in line with regular hands,

as in they do not properly reference hud, this ned proc for add overlays handles these runtimes.
 2021-03-04 13:19:53 +01:00
Novacat
7f7c5873d6 Merge pull request #9814 from VOREStation/upstream-merge-7820 
[MIRROR] Adds the Restraining Bolt.
 2021-02-28 23:16:43 +00:00
Verkister
52e06ab74d Merge pull request #9553 from mel-byond/soulcather-guest-hud 
[FEATURE] Add HUD icons for Soulcatcher guests
 2021-02-09 18:16:54 +00:00
Novacat
d9c7aba53d Merge pull request #9544 from VOREStation/upstream-merge-7803 
[MIRROR] Fixes dark click catcher
 2021-01-24 06:57:14 +00:00
Novacat
9e27153990 Merge pull request #9578 from Heroman3003/shadekin-minor-stuff 
Some minor shadekin adjustments
 2021-01-16 23:45:55 +00:00
Novacat
e8bebaf761 Merge pull request #9524 from Heroman3003/shadehud2 
Consolidates and updates shadekin energy/darkness HUD
 2020-12-27 07:34:07 +00:00
Verkister
917aa726eb Merge pull request #9279 from ShadowLarkens/revert-8742-bellyitemfix 
Revert "Fix unintended inbelly item interactions caused by copypaste"
 2020-11-07 14:39:46 +00:00
Nadyr
3b8655f2e4 Merge pull request #768 from CHOMPStationBot/upstream-merge-9257 
[MIRROR] This is *not* what _onclick is for FFS
 2020-10-28 05:01:59 -04:00
Verkister
420b44c449 Merge pull request #9257 from ShadowLarkens/paifix 
This is *not* what _onclick is for FFS
 2020-10-28 07:11:48 +00:00
Chompstation Bot
77c15811a2 Datum Component System (/tg/ port) 2020-10-19 10:36:26 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
ShadowLarkens
bd364c83b3 TGUI Porta Turrets 2020-09-18 02:51:08 -07:00
ShadowLarkens
90bec919e9 TGUI Silicon Crew Manifest & PDA Access 2020-09-17 23:43:31 -07:00
Heroman3003
41814c6a82 Fixes indents 2020-09-01 11:30:14 +10:00
Heroman3003
fee5eb895a Makes the fullness alert more accurate 2020-09-01 11:27:53 +10:00
cadyn
860615c70c Upstream oopsie-fixes 2020-08-28 13:00:42 -07:00
ShadowLarkens
264793b36a Fading titlescreen from /tg/ 2020-08-25 16:50:23 -07:00
Cadyn
5e02857320 Many bugfixes! 2020-08-23 19:54:11 -07:00
ShadowLarkens
ac03887a55 Merge remote-tracking branch 'upstream/master' into vore_overlays 2020-08-23 10:39:55 -07:00
Atermonera
8fc35d4da4 Merge pull request #7523 from Meghan-Rossi/ghostqol 
Ghost sechud verb, shift-click examine, alt-click turf tab
 2020-08-21 01:30:40 -04:00
listerla
7e65840937 Adds shift-middle click pointing (#7487) 
* Adds shift-middle click pointing

* Borgs and buckled folk can now point

* Create Lorilili - pointing.yml
 2020-08-20 22:15:16 -04:00