Tsurupeta
d4ec25e748
all else
2023-08-08 14:01:18 +03:00
JMoldy
42b1aa7693
Makes vomiting clear some disgust
2023-07-26 16:49:13 -05:00
BongaTheProto
21c3abdfb7
Merge remote-tracking branch 'upstream/master'
2023-01-18 04:20:45 -05:00
SandPoot
e76ed6a1ea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-17 22:26:56 -03:00
Darius and GitHub
791f89a179
Prevent nutriment pump with no process food trait ( #15941 )
...
Prevents the nutriment pump implant from functioning on mobs with TRAIT_NO_PROCESS_FOOD., as this behavior appears to be unintended.
2023-01-14 04:51:42 +01:00
BongaTheProto
9cdaffc417
Merge remote-tracking branch 'upstream/master'
2022-09-18 23:40:20 -05:00
SandPoot
cc9c36bd13
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-17 22:48:51 -03:00
shellspeed1 and GitHub
b8f7bb00c9
Fixes encoded langauge so people can speak it, also redoes xeno tongue so it can speak same langauges as rest of crew. ( #15845 )
2022-09-17 13:44:29 -07:00
Pin-alternative
d44e4cf056
stuffo
2022-07-22 22:56:10 +10:00
Pin-alternative
64cbd81e9c
Merge remote-tracking branch 'upstream/master' into cursed
2022-06-07 17:10:33 +10:00
SandPoot
d1c44afdae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-01 19:21:46 -03:00
Lin and GitHub
37cd25109e
Merge pull request #15634 from deathride58/jukeboxrefresh
...
Jukebox refresh - Jukebox queue, working volume knob, emagging, preliminary multiz support, and more!
2022-06-01 21:18:02 +00:00
SandPoot
2806f1ef7f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-01 15:46:12 -03:00
Pin-alternative
c0f224efff
some more crap
2022-05-28 20:18:09 +10:00
Putnam3145
4af3633d6f
Some gas balancing/rearranging
2022-05-24 18:11:58 -07:00
deathride58
5d648fcf6a
makes jukeboxes deal hearing loss when too loud, makes being deaf temporarily mute jukebox
2022-05-21 19:23:10 -04:00
SandPoot
89fa5c0bfe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-21 00:13:59 -03:00
Timothy Teakettle
b245a3d6b8
yes
2022-05-19 20:28:38 +01:00
SandPoot
24b740999b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-13 02:48:21 -03:00
SandPoot
41949a8be1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-29 13:24:42 -03:00
Putnam3145
a7408beb4c
Updated auxmos to 1.0
2022-04-28 21:07:51 -07:00
Putnam3145
621b974691
Allow planets to have fuel-based atmospheres
2022-04-25 20:27:01 -07:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
SandPoot
07fe9bdbca
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-14 15:09:35 -03:00
silicons and GitHub
fcfde73f5e
Merge pull request #15425 from DeltaFire15/slower-organ-healing
...
Nerfs* passive organ healing, plus some minor stuff
2022-03-13 14:26:00 -07:00
SandPoot
7523279254
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-07 22:07:59 -03:00
silicons and GitHub
af6e43c595
refactors clickcatchers/parallax/fullsceren ( #15460 )
...
* :)
* that
* move those there
* refactor that too
* wew
* stuff
* almost.
* sigh
* just need speed
* stuf
* pain
* hm
* tweaks
* that
* eh
* wack
* a
* done
* that's important
* wacky
* all that
* fixes
* typo
* that
* a
* funny
* that
* that
* woo
* help im losing my fucking mind
* okay
* fix
2022-02-07 15:17:24 -08:00
SandPoot and GitHub
805ff012fc
Fix drinks ( #225 )
2022-02-04 11:20:21 -03:00
SandPoot
2d0637221a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-04 00:59:26 -03:00
BlueWildrose and GitHub
1d2b30d07d
sylvan language now speakable for real
2022-01-31 01:40:37 -07:00
SandPoot
3a03ee6475
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-23 16:15:11 -03:00
silicons and GitHub
f601580854
Merge pull request #15430 from DeltaFire15/synth-coolant
...
Synth stuff : Balancing Nightmare Edition (aka, coolant)
2022-01-22 13:59:12 -08:00
SandPoot
c0e1198702
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-05 18:25:05 -03:00
Lin and GitHub
2379a2a342
Merge pull request #15370 from Putnam3145/genericized-plasma-trit
...
Total fire overhaul + new atmos stuff + uh oh stinky toxins nerf + sauna buff + ??
2022-01-03 22:31:40 +00:00
DeltaFire
074fe5b417
a bunch of stuff
...
5° min temp adjustment for active cooling
150% max total cooling efficiency as opposed to 100%
passive heating cools instead at >100% efficiency (to -30°C min)
EMPs jam cooling system readouts.
Nanogel is now printable, for a decent price though it needs a bit of diamond.
2022-01-02 19:44:35 +01:00
DeltaFire
fe7499da90
no lung break choking message for nobreath
2022-01-02 01:42:56 +01:00
DeltaFire
fa358a807f
HUD info, more readouts
...
HUD & a examine readout for the HUD for coolant & cooling efficiency info.
Penalty active-cooling-cost-wise when in very low pressure area.
Higher minimum efficiency for active cooling.
Synths don't look pale.
2022-01-02 01:27:50 +01:00
Putnam3145
b83ec40766
Fixes way too much gas being breathed
2021-12-22 01:27:40 -08:00
DeltaFire
0faac6dce6
hoo boy
2021-12-14 23:06:42 +01:00
SandPoot
e21a8445e2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-12-10 14:53:39 -03:00
DeltaFire
1e375d86a2
cyber organ oversight & synth satiety
2021-12-09 19:09:10 +01:00
DeltaFire
eead0e6282
slow
2021-12-09 18:35:26 +01:00
Putnam3145
6a0f371f65
removes a redundant variable declaration
2021-12-08 16:20:33 -08:00
SandPoot
f503b91f4d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-20 22:23:24 -03:00
DeltaFire
855df65ba2
cord cell charge
2021-11-16 22:56:31 +01:00
Putnam3145
60e61ecbb0
Fire overhaul
2021-11-13 22:43:54 -08:00
SandPoot
1ee8c134f8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-09 14:38:38 -03:00
Putnam3145
da138b1b37
why did i think i could remove this
2021-11-07 16:47:57 -08:00
Putnam3145
aa619e8a3a
Fixes simultaneous suffocate/overbreathe
2021-11-07 15:33:08 -08:00