Commit Graph

20144 Commits

Author SHA1 Message Date
Putnam3145
993db66237 Adds a LOT more enthalpy to tritium 2022-03-06 14:54:48 -08:00
Timothy Teakettle
778bf1777b fixes coiling issue (#15530)
* why

* 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

* fix

* Update preferences.dm

* no slimes you're not allowed the hidden sprite
2022-02-28 14:01:57 -08: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
silicons
edd3a510f1 Merge pull request #15526 from timothyteakettle/bartender-pda
adds bartender cartridge for drink recipe searching, updates chemist cartridge to have equivalent functionality for all recipes
2022-02-26 18:08:47 -07:00
silicons
bf9afd846d Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system
[PORT] Removes the non bitflag slot defines
2022-02-26 18:08:28 -07:00
silicons
87e58fcc14 Merge pull request #15505 from SandPoot/playertimes-tgui
Player Playtime TGUI
2022-02-26 18:08:18 -07:00
silicons
fe427e7516 Merge pull request #15503 from Arturlang/Bodybuilding
Lets the limbgrower make mobs with only a chest
2022-02-26 18:08:12 -07:00
silicons
2ec2c4478d Merge pull request #15495 from Putnam3145/dynamic_holiday
Weekly high-chaos dynamic days
2022-02-26 18:08:04 -07:00
keronshb
681679e675 cleanup 2022-02-25 22:42:27 -05:00
keronshb
1415b9580f Last fixes 2022-02-25 22:29:09 -05:00
SandPoot
f7ea1f377d oops, replace all is a hell of a drug 2022-02-25 17:09:31 -03:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03: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
Timothy Teakettle
027002f928 haha what if we didn't show secretcatchem 2022-02-23 12:07:03 +00:00
Timothy Teakettle
56547a2556 generalizes recipe searching, adds chemistry functionality 2022-02-23 11:38:04 +00:00
timothyteakettle
b578c65d74 fixes 2022-02-23 00:52:17 +00: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
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
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
c42aa2c30a Upload files 2022-02-15 22:16:07 -03: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
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
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
Putnam3145
3b1304f432 Weekly dynamic days 2022-02-02 17:38:19 -08:00
SandPoot
8acb800301 Upload files 2022-02-02 17:57:48 -03:00