Commit Graph

2807 Commits

Author SHA1 Message Date
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
silicons
dee1db4a3a Merge pull request #15558 from SandPoot/mechs-are-vehicles
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
Artur
66ce34caa5 Signal and moves it to the back 2022-04-07 15:54:13 +03:00
Artur
3824daba05 Trailing newlines 2022-04-06 16:10:57 +03:00
Artur
813ca511b5 Remaps sleepers to stasis beds and make stasis actually leave you 2022-04-06 15:58:27 +03:00
Artur
c36019bf56 Adds stasis beds 2022-04-06 15:38:05 +03:00
Solaris-Shade
a70fb1fb43 Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-31 15:29:31 -04:00
BlueWildrose
3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304)
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-03-30 20:06:00 -07:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Solaris-Shade
d9ff37d2ff Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-19 11:23:16 -04:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Lin
c25e074128 Merge pull request #15547 from Putnam3145/extend-min-pop
Adds a minimum vote count to continue rounds
2022-03-14 18:48:11 +00: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
a3284a0923 Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf
Weakens chemistry's revival chems
2022-03-13 14:24:57 -07:00
Solaris-Shade
0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade
171bd18c8a Updated Projectile code some more. 2022-03-11 22:23:01 -05:00
Putnam3145
9b4c3a5be3 Adds a minimum greater vote count to extend rounds 2022-03-10 21:35:08 -08:00
Solaris-Shade
2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
SandPoot
45a49c6106 Upload files 2022-03-05 13:49:26 -03:00
Lin
ae5896d6cf Merge pull request #15525 from keronshb/ambitioncheck
Ambitions from Skyrat
2022-02-27 02:34:13 +00:00
silicons
2323bd31cd Merge pull request #15522 from bunny232/wintercoats
Insulation works both ways you know.
2022-02-26 18:08:59 -07:00
SandPoot
de96a68bf5 mistake 2022-02-25 17:01:48 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
Lin
fd84b21350 Merge pull request #15523 from Citadel-Station-13/Putnam3145-patch-1
Change BOMB_TARGET_SIZE to match new trit fire
2022-02-25 04:41:54 +00:00
Timothy Teakettle
f6b9858f4f adds snake coiling (#15514)
* new signals for resting and stop pulling

these are to be used as signals that will cancel the coiling

* Create coiling.dm

* Update coiling.dm

* adds sprite accessory for coiled naga

* main changes that apply the actual visuals to the coiling mechanics

* adds message to coiling, fixes offset, adds action icon

* coil offset was using old direction

* reordering

* fixes coil sprite not disappearing

* fixes offsets, solves loadout issue

* follows lin's suggestion and adds support for slimes by making it entirely handled in handle mutant
2022-02-23 22:01:13 -07:00
keronshb
3ea22f97a6 Merge remote-tracking branch 'upstream/master' into ambitioncheck 2022-02-22 17:10:25 -05:00
Putnam3145
6fb26a5afc Raised sub target exponent too
Needs to be this way so plasma bombs aren't way stronger
2022-02-21 21:05:11 -08:00
Putnam3145
87e4f9353f Change BOMB_TARGET_SIZE to match new trit fire
I am SO GLAD I WROTE THIS CODE THIS WAY.
2022-02-21 20:57:56 -08:00
evan
6b3fb90ef6 keep the cold in 2022-02-21 17:44:27 -05:00
Lin
1adbf914c2 Merge pull request #15414 from BlueWildrose/wingport
TG wing ports with some Citadel additions. All species can now use the flight potion and grow (unique) wings.
2022-02-21 00:02:21 +00:00
keronshb
eb7d0bfe71 Last of the linter fixes 2022-02-11 20:35:56 -05:00
keronshb
cc249e1e85 Fixes some linter issues 2022-02-11 15:54:03 -05:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05: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
silicons
3dba8ef807 Merge pull request #15482 from SandPoot/balloon-alert-port
Ports Balloon Alert from TG
2022-02-04 13:20:43 -08:00
silicons
531afa7d90 Merge pull request #15487 from DeltaFire15/stabilized-orange-fix-nerf
Fixes / nerfs stabilized orange extract temp adjustments and tweaks its effects on Synthetics
2022-02-04 07:59:09 -08:00
DeltaFire
04d806c700 orange
stabilized orange can now cool at most 5 per tick instead of infinite

robots only cool half, which means 5 per life tick (status effects fire twice per life tick total)

for robots, it cools towards ~ -100°C target temp, provided you are in a location that supports it.
2022-01-31 00:50:22 +01:00
DeltaFire
e71e86cf23 adapted 2022-01-29 16:43:03 +01:00
SandPoot
5fbfde96df Update layers_planes.dm 2022-01-25 14:47:57 -03:00
SandPoot
aee811078a Merge branch 'master' of https://github.com/SandPoot/Citadel-Station-13 into balloon-alert-port 2022-01-25 14:41:34 -03:00
SandPoot
5bca0fb563 Upload files 2022-01-25 14:32:25 -03: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
DeltaFire
e7ed288cc2 finishing touches
suitlinking now tells you on examining the cooling system readout.
miner gear suitlinking only works on the lavaland z.
corruption has a medium-severity readout jamming event added to the pool.
integrating coolant only counts as 40% of its volume for cooling efficiency purposes and is capped at adding at most 25% of current blood volume to cooling efficiency calculations.
2022-01-22 18:34:54 +01: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
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
DeltaFire
f1c40b8001 increases max passive heat temp cap by 50°C
title. Only applies if cooling is insufficient and a Synthetic allows themselves to heat up that far.
2022-01-01 19:39:10 +01:00
DeltaFire
c7667a2f50 coldblooded blacklist & blood types
standartizes blood types of ipc, synths and synth mammals (which used organic blood??) to S type blood, plis implements coldblooded blacklist (with trait point balancing after.
2022-01-01 18:52:02 +01:00