Commit Graph

812 Commits

Author SHA1 Message Date
SandPoot
cc9c36bd13 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-17 22:48:51 -03:00
Hatterhat
1f0ad3e68c its a lil janky but we take those (#15834)
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2022-09-17 13:47:24 -07:00
SandPoot
be1357bdb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-07 17:29:38 -03:00
Lin
6f97ec2b1d Merge pull request #15656 from deathride58/animfix
Animation refresh - Fully restores animations broken by BYOND updates, some light animation-related tweaks, and more
2022-06-07 18:05:07 +00:00
SandPoot
6bff4b4165 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-05 01:38:42 -03:00
deathride58
1a918ed8db animation refresh - huge unatomized bundle of fixes and tweaks to numerous animations in the game 2022-05-31 19:22:30 -04:00
deathride58
ee92230176 Moves newplayer button population to a dedicated proc, significantly reducing the hackiness involved for getting the agegate working proper 2022-05-30 22:08:49 -04:00
SandPoot
8bb1c2b32a Upload files 2022-05-30 01:31:54 -03:00
SandPoot
856850c1b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-29 21:41:59 -03:00
deathride58
ace4eb6c8d [S] blocks a freshly rediscovered aimbot exploit 2022-05-26 20:03:03 -04: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
2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
SandPoot
9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -03:00
SandPoot
ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00: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
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
Solaris-Shade
48db01702b Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-04-06 22:31:51 -04:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
66b05f5261 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-06 16:40:58 -03:00
SandPoot
205c9b3d43 Those are too early. 2022-03-23 12:21:29 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot
16fddbb140 Upload files 2022-03-18 18:35:29 -03:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Solaris-Shade
0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
SandPoot
7a2cc5ddfa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-03-10 22:03:11 -03: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
SandPoot
fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
SandPoot
5dc331c406 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-13 11:51:07 -03:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05: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
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
e2b37a13db Fixes a bunch of stuff (#221) 2022-01-30 14:37:27 -03:00
SandPoot
6e1c221e03 Update screen_object.dm 2022-01-29 23:45:44 -03:00
SandPoot
e8c8d2b0ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-25 11:38:07 -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
SandPoot
3a03ee6475 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-23 16:15:11 -03: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
DeltaFire
82177b9ecc oops 2022-01-03 03:33:35 +01:00
DeltaFire
46eb618f02 more hud stuff
color coding
percentage instead of blood volume
indicator for if active cooling or not (small + and the bar changes to blue)
2022-01-03 02:36:03 +01: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
LetterN
fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +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
SandPoot
3da59fc38c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-05 14:27:17 -03:00
keronshb
9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
SandPoot
f1f6ac0109 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-31 22:14:23 -03:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00