Commit Graph

29752 Commits

Author SHA1 Message Date
Timothy Teakettle
56547a2556 generalizes recipe searching, adds chemistry functionality 2022-02-23 11:38:04 +00:00
timothyteakettle
4adb870324 improves formatting of the couldn't find reagent text 2022-02-23 00:57:39 +00:00
timothyteakettle
b578c65d74 fixes 2022-02-23 00:52:17 +00:00
SandPoot
6c347a9186 Fixes targets (#15521)
* Automatic changelog compile [ci skip]

* Update files

Co-authored-by: Changelogs <action@github.com>
2022-02-22 15:50:32 -07:00
keronshb
0f4a3efcb5 Fixes weird flipped line 2022-02-22 17:26:19 -05:00
keronshb
3ea22f97a6 Merge remote-tracking branch 'upstream/master' into ambitioncheck 2022-02-22 17:10:25 -05:00
Timothy Teakettle
fd997e1615 initial test changes 2022-02-22 21:59:28 +00: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
silicons
de3ea65587 fixes parallax whitifier applying when parallax is disabled (#15516)
* :)

* 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

* a

* woops
2022-02-21 17:20:41 -07:00
evan
6db0142ec3 fluffy tail costume. 2022-02-21 18:58:54 -05:00
evan
7f9d7936f0 a 2022-02-21 18:31:48 -05:00
evan
2619387dc1 woops 2022-02-21 18:25:12 -05:00
evan
93c322f494 a 2022-02-21 18:23:41 -05:00
evan
4d403ebca5 Update miscellaneous.dm 2022-02-21 18:14:56 -05: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
Artur
5d446f9133 Merge branch 'Bodybuilding' of https://github.com/Arturlang/Citadel-Station-13 into Bodybuilding 2022-02-21 01:09:30 +02:00
Artur
29a4e10592 Looping performance tweaks 2022-02-21 01:09:21 +02:00
Putnam3145
a49b19a4f7 makes reinforced plasma glass windows buildable 2022-02-19 19:14:48 -08:00
Arturlang
2b11cfcc33 Linz's suggestion
Co-authored-by: Lin <linzolle@gmail.com>
2022-02-19 12:55:35 +02:00
Timothy Teakettle
c9051a6a08 adds polychromic clown outfit and mask (#15359)
* why

* polyclown

* outfit / loadout / etc

* its not pink what do you mean

* newline

* fixes

* test icon diffs
2022-02-18 14:38:50 -08:00
Arturlang
86c711a003 Apply suggestions from code review
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-02-18 23:44:03 +02:00
Lin
4aad2d210a Merge pull request #15507 from silicons/blah
fixes linter errors
2022-02-16 05:35:56 +00:00
silicons
984f37cc80 fix 2022-02-15 22:03:27 -07:00
silicons
ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
SandPoot
c42aa2c30a Upload files 2022-02-15 22:16:07 -03:00
Artur
50455227f1 More comments 2022-02-16 00:49:46 +02:00
Artur
f404390c91 Edge case and documentation 2022-02-16 00:46:25 +02:00
SandPoot
a3d9dd2c99 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into job-exp-exemption 2022-02-15 18:35:23 -03:00
SandPoot
52a8fe276b Update files 2022-02-15 18:27:33 -03:00
silicons
5b75509603 Merge pull request #15265 from keronshb/familyport
(Ready for Testing) Ports MRP Families and hardsync
2022-02-13 02:32:26 -08:00
silicons
4632c85d71 silly proof of concept item (#15456)
* should have listened to putnam

* why am i doing this

* that

* lmao

* more

* it compiles

* it compiles

* fixes

* FUNNY GLOW SWORD

* more..

* unterminated text

* wthat wasn't working

* it's coming together

* woo

* what have i done

* fin.

* eh
2022-02-11 21:04:21 -08: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
Artur
fc6f3cdffc tested and done, seems to work 2022-02-11 16:54:05 +02:00
Artur
345c1616f2 Adds a way to build bodies using the limbgrower 2022-02-10 18:49:24 +02: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
SandPoot
7e970fe5f1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into changelogs-tgui 2022-02-04 13:06:20 -03: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
silicons
c0e097f589 Merge pull request #15484 from DeltaFire15/adaptation
Space Adaptation nulls low-pressure cooling penalties of passive cooling for Synthetics.
2022-02-04 07:58:44 -08:00
silicons
6708bfb668 Merge pull request #15444 from LiteralMushroom/patch-6
Literally just makes it so slimes can have (decorative) wings.
2022-02-04 07:58:29 -08:00
silicons
b94d00e934 Merge pull request #15448 from CoreFlare/hi-yes-we-want-wings-too
literally also just makes it so IPCs can have winges
2022-02-04 07:58:13 -08:00
silicons
4c8c7d5872 Merge pull request #15480 from SandPoot/cancel-action
Allows you to cancel actions
2022-02-04 07:57:50 -08:00
silicons
a5d0048c0c Merge pull request #15485 from SandPoot/bgone-layer
Removes layer from /atom/movable/screen
2022-02-04 07:57:36 -08:00
silicons
be82946ff6 Merge pull request #15491 from SandPoot/autolathe-tgui
Ports TGUI for autolathe
2022-02-04 07:57:22 -08:00
silicons
5400def46a Merge pull request #15493 from SandPoot/bots-tgui
Ports Simplebot TGUI conversion
2022-02-04 07:55:32 -08:00
silicons
be0aba492f Merge pull request #15494 from SandPoot/custom-shuttle-ui
TGUIzes the Custom Shuttle
2022-02-04 07:55:23 -08:00