keronshb
3ea22f97a6
Merge remote-tracking branch 'upstream/master' into ambitioncheck
2022-02-22 17:10:25 -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
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
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
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
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
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
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
SandPoot
de35e561b5
Update files
2022-01-25 12:52:11 -03:00
SandPoot
aac92ef029
Update mob.dm
2022-01-25 12:40:57 -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
SpiWat
45c7ec0fdb
The book has 10 pagess remaining.
2022-01-24 20:39:52 -05:00
Putnam3145
a408957bc6
Various chem tweaks
2022-01-22 16:40:05 -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
4aa0332e99
no.
2022-01-22 19:38:02 +01: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
7e326ed947
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2022-01-22 20:42:55 +08:00
silicons
f3332f8607
Merge pull request #15470 from Putnam3145/trit-messed-up
...
Fixes trit/hydrogen fires to have right products
2022-01-22 04:38:11 -08:00
silicons
f85d0dbda0
Merge pull request #15449 from Putnam3145/gib-podpeople
...
Allows pod people to be made using other fluids
2022-01-22 04:34:59 -08:00
silicons
a7993cd916
Merge pull request #15419 from Putnam3145/funny-atmos-event
...
Adds an event that speeds up/slows down atmos
2022-01-22 04:34:42 -08:00
silicons
2b726d7670
Merge pull request #15324 from Trilbyspaceclone/ashtree
...
Ashen tree!
2022-01-22 04:34:28 -08:00
LetterN
7eb5e4a835
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2022-01-18 11:46:16 +08:00
Putnam3145
ece671087f
Added a bit of enthalpy to tritium
2022-01-13 20:30:26 -08:00
