Commit Graph

29663 Commits

Author SHA1 Message Date
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
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
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
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
Putnam3145
a49b19a4f7 makes reinforced plasma glass windows buildable 2022-02-19 19:14:48 -08: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
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
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
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
Sakura
08b38a7e70 Ashwalker Update (#15466)
* Ashwalker Update

* Update generic_positive_events.dm

* Update ashwalker.dm

* fixing newlines

* Update code/modules/antagonists/_common/antag_datum.dm

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

* literally 1984

* unlimiting spawns

* Create antag_datum.dm.bak

* Revert "Create antag_datum.dm.bak"

This reverts commit d91e1f4c4d9c86bc4a275ef19f45e8927dd93cae.

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2022-02-03 19:34:15 -08:00
SandPoot
8acb800301 Upload files 2022-02-02 17:57:48 -03:00
SandPoot
6d2680d7ec Update files 2022-02-02 12:31:20 -03:00
SandPoot
4c93bfc764 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into changelogs-tgui 2022-02-02 02:07:13 -03:00
SandPoot
29be8573ea Upload files 2022-02-02 02:01:04 -03:00
Lin
daa8032712 Merge pull request #15488 from BlueWildrose/getouttathewaynerd
Get out of the way, you weaboos. The slimes were here first.
2022-02-02 04:59:36 +00:00
SandPoot
760ed48476 Upload files 2022-02-02 00:45:32 -03:00
SpiWat
386a7480a7 Tweenty -> Twenty
Spelling.
2022-01-31 19:12:00 -05:00
BlueWildrose
a6237d41fa Rachnidian: r -> c 2022-01-31 01:55:39 -07:00
BlueWildrose
674dbaac1e Neo-kanji: k -> j 2022-01-31 01:55:10 -07:00
BlueWildrose
8cb9f17f1e Dwarvish: D -> w 2022-01-31 01:54:49 -07:00
BlueWildrose
1d2b30d07d sylvan language now speakable for real 2022-01-31 01:40:37 -07: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
SandPoot
6e1c221e03 Update screen_object.dm 2022-01-29 23:45:44 -03:00
DeltaFire
e71e86cf23 adapted 2022-01-29 16:43:03 +01:00
Lin
ba17f7180a Merge pull request #15477 from DeltaFire15/hunt-for-that-one-beaker
Certain reagents are once again invalid for blood dna relaying and therefore podcloning / decal detscanning.
2022-01-28 00:06:22 +00:00
Lin
9cb86d3c79 Merge pull request #15479 from SpiWat/patch-1
The book has 10 pagess remaining.
2022-01-27 23:51:07 +00:00