Commit Graph

1236 Commits

Author SHA1 Message Date
silicons
2865dc6416 Merge pull request #15779 from Linzolle/radial-surgery
radial menu surgery
2022-08-20 12:24:56 -07:00
silicons
4f82820062 Merge pull request #15781 from zeroisthebiggay/breadbay
the great medbay resprite PR: ported from a freshly merged TG PR
2022-08-20 12:24:46 -07:00
zeroisthebiggay
a600ea86b9 midround pr get trolled 2022-08-17 00:59:07 -04:00
Linzolle
ee3ced89ef less list instantiation man good 2022-08-12 14:27:12 -07:00
Linzolle
e5ee36c182 add radial menu to organ manip 2022-08-12 14:11:03 -07:00
zerothebigboy
1bc3796b06 watchmegetgitbanned 2022-08-11 19:17:16 -04:00
Putnam3145
c8e13e2f0b Makes stasis beds fine for surgery 2022-07-30 01:22:58 -07:00
deathride58
ca879a83f5 Merge pull request #15651 from timothyteakettle/oof-ouch-my-bones!
adds paper skin and glass bones quirks
2022-06-05 00:26:55 -04:00
Lin
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
Timothy Teakettle
411a5c63ee paper skin, glass bones 2022-05-29 20:04:49 +01: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
Lin
f4dca7caa6 Merge pull request #15631 from timothyteakettle/genitals-get-optimised
optimises genital/tail organs by returning when calling on_life
2022-05-20 19:51:56 +00:00
Timothy Teakettle
b245a3d6b8 yes 2022-05-19 20:28:38 +01:00
Timothy Teakettle
275b4ebedd Update _bodyparts.dm 2022-05-17 13:50:23 +01:00
Lin
a899b5db81 Merge pull request #15607 from Putnam3145/auxmos-1
Updates auxmos to 1.0 (plus other atmos stuff with it)
2022-05-13 05:45:33 +00:00
Lin
95416bbedc Merge pull request #15587 from TomGarou/Synth-Brainwashing
Synth Brainwashing AKA Reprogramming
2022-05-12 20:29:04 +00: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
silicons
13f326c939 Merge branch 'master' into Synth-Brainwashing 2022-04-15 17:44:30 -07:00
silicons
e67340f147 Merge pull request #15590 from SandPoot/noisy-surgery
Adds sound effects to surgeries
2022-04-15 17:43:37 -07:00
silicons
da09439093 Merge pull request #15585 from SandPoot/Initialize(mapload)
Every case of initialize that should have mapload, does
2022-04-15 17:41:57 -07:00
BlueWildrose
f235839351 Adds carcinisoprojection jelly, a limb regrowth chem that is made from slime mutation toxin & blood (#15053)
* Limb regrowth chem, new disease of crab cancer

* Limb regrowth adjustments

* oops, sorry linters.

* oh right this would probably fuck with dullahans

* woops missed a newline

* Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

* just realized this check is unnecessary.

* let's add a mood debuff while we're at it

* Update medicine_reagents.dm

* add a bounty

* misspelling

* Update crabcancer.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2022-04-15 00:37:08 +02:00
SandPoot
4e296b72d5 Upload files 2022-04-09 15:42:57 -03:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
TomGarou
59874f6553 Synth Brainwashing
Adds synthetic brainwashing to Citadel-Station-13
2022-04-08 01:26:07 -04:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
baee52349b Upload files 2022-03-16 15:41:07 -03:00
silicons
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
silicons
ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
silicons
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
BlueWildrose
1d2b30d07d sylvan language now speakable for real 2022-01-31 01:40:37 -07:00
silicons
9205545d16 Merge pull request #15317 from LetterN/what-should-i-name-this-branch
TGUI hardsync & stuff
2022-01-25 00:06:59 -08:00
silicons
f601580854 Merge pull request #15430 from DeltaFire15/synth-coolant
Synth stuff : Balancing Nightmare Edition (aka, coolant)
2022-01-22 13:59:12 -08:00
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
Lin
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
LetterN
fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
DeltaFire
0faac6dce6 hoo boy 2021-12-14 23:06:42 +01: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
LetterN
8dcfea5817 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-21 10:34:14 +08: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
LetterN
8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00