Commit Graph

46360 Commits

Author SHA1 Message Date
Lin
f4dca7caa6 Merge pull request #15631 from timothyteakettle/genitals-get-optimised
optimises genital/tail organs by returning when calling on_life
2022-05-20 19:51:56 +00:00
silicons
fd7b64c886 Merge pull request #15625 from Citadel-Station-13/Linzolle-patch-1
Allow numbers in character names
2022-05-20 12:36:48 -07:00
CitadelStationBot
7da34767d6 Automatic changelog generation for PR #15630 [ci skip] 2022-05-20 14:36:42 -05:00
silicons
1fc41baf59 Merge pull request #15630 from SandPoot/flavor-text-changes
Makes flavor texts a tiny bit better
2022-05-20 12:36:40 -07:00
CitadelStationBot
3207718088 Automatic changelog generation for PR #15629 [ci skip] 2022-05-20 03:02:09 -05:00
Lin
7a8a0aa525 Merge pull request #15629 from deathride58/bloodtrailfix
fixes blood trails looking Wonky by removing their base iconstate
2022-05-20 08:02:06 +00:00
SandPoot
73da7b6e03 flavor_Text != flavor_text 2022-05-20 00:00:42 -03:00
Lin
b22ffa4789 Merge pull request #15627 from timothyteakettle/a-slight-slime-nerf
makes blunt wound damage to BIO_ONLY_FLESH convert at the same rate as slash wound damage to BIO_ONLY_BONE
2022-05-19 21:37:03 +00:00
Timothy Teakettle
b245a3d6b8 yes 2022-05-19 20:28:38 +01:00
SandPoot
da1f58f297 Update files 2022-05-19 13:23:17 -03:00
deathride58
f9ea85852e fixes blood trails looking Wonky by removing their base iconstate 2022-05-18 21:40:35 -04:00
Changelogs
c50746354f Automatic changelog compile [ci skip] 2022-05-19 00:55:20 +00:00
CitadelStationBot
8f479aa213 Automatic changelog generation for PR #15624 [ci skip] 2022-05-17 22:29:10 -05:00
Lin
e8947a4e4d Merge pull request #15624 from timothyteakettle/better-quirk-menu
quirks are now organised into three tabs for positive, neutral and negative
2022-05-18 03:29:07 +00:00
Lin
9d86c5402a Merge pull request #15626 from SandPoot/emotes
Minor touches on emotes
2022-05-18 03:27:08 +00:00
Timothy Teakettle
275b4ebedd Update _bodyparts.dm 2022-05-17 13:50:23 +01:00
Changelogs
35f86287e2 Automatic changelog compile [ci skip] 2022-05-17 00:46:59 +00:00
SandPoot
5dad84a486 Update files 2022-05-16 21:44:25 -03:00
Lin
ee912eaf11 Merge pull request #15618 from Citadel-Station-13/silicons-patch-2
fixes change number of hands off by 1 error
2022-05-16 20:56:38 +00:00
Lin
b6f176dd8d allow numbers in character names 2022-05-16 13:44:01 -07:00
Timothy Teakettle
1c9f6077da loadout organisation 2022-05-16 21:22:22 +01:00
Timothy Teakettle
924bca64d1 Update preferences.dm 2022-05-16 16:38:50 +01:00
CitadelStationBot
5ba731d540 Automatic changelog generation for PR #15617 [ci skip] 2022-05-15 21:31:04 -05:00
Lin
f2ca3a067d Merge pull request #15617 from timothyteakettle/timothyteakettle-patch-1
poly alt cloak can now be renamed/dedescriptioned in loadout
2022-05-16 02:31:01 +00:00
silicons
dc88c32c77 Update inventory.dm 2022-05-15 13:53:25 -07:00
silicons
ffe0a0a9e7 Update inventory.dm 2022-05-15 13:53:07 -07:00
silicons
26f6e92e70 Update inventory.dm 2022-05-15 13:52:33 -07:00
Changelogs
834a316bd4 Automatic changelog compile [ci skip] 2022-05-14 00:55:41 +00:00
Timothy Teakettle
3157a11209 Update neck.dm 2022-05-13 15:36:05 +01:00
Lin
505ec6bb03 Merge pull request #15616 from deathride58/hubrefreshpatch
Moves server_taglines.txt to config dir for better TGS compatibility
2022-05-13 05:46:11 +00:00
CitadelStationBot
b990650e5a Automatic changelog generation for PR #15607 [ci skip] 2022-05-13 00:45:35 -05:00
Lin
a899b5db81 Merge pull request #15607 from Putnam3145/auxmos-1
Updates auxmos to 1.0 (plus other atmos stuff with it)
2022-05-13 05:45:33 +00:00
Putnam3145
4d98000453 Versioning 2022-05-12 22:31:06 -07:00
Changelogs
5138644af0 Automatic changelog compile [ci skip] 2022-05-13 00:56:38 +00:00
deathride58
8838fcc2f3 Moves server_taglines.txt to config dir to avoid requiring manual updates of the strings folder with TGS 2022-05-12 17:22:52 -04:00
CitadelStationBot
63673cd5a3 Automatic changelog generation for PR #15587 [ci skip] 2022-05-12 15:29:06 -05:00
Lin
95416bbedc Merge pull request #15587 from TomGarou/Synth-Brainwashing
Synth Brainwashing AKA Reprogramming
2022-05-12 20:29:04 +00:00
CitadelStationBot
677a7f48f8 Automatic changelog generation for PR #15610 [ci skip] 2022-05-12 15:27:56 -05:00
Lin
8b9014b52d Merge pull request #15610 from deathride58/hubrefresh2022
Hub refresh 2022 - Cleans up update_status(), adds more hub-related config options, and more!
2022-05-12 20:27:54 +00:00
CitadelStationBot
d4de6c69ff Automatic changelog generation for PR #15611 [ci skip] 2022-05-12 15:12:24 -05:00
Lin
4771754343 Merge pull request #15611 from LiteralMushroom/patch-5
Alter form for wings.
2022-05-12 20:12:22 +00:00
CitadelStationBot
d5744e21c8 Automatic changelog generation for PR #15612 [ci skip] 2022-05-12 15:11:57 -05:00
Lin
dec7751f95 Merge pull request #15612 from SandPoot/status_displays
Syncs status displays to tg's version
2022-05-12 20:11:54 +00:00
CitadelStationBot
95a3d5b226 Automatic changelog generation for PR #15615 [ci skip] 2022-05-12 15:11:48 -05:00
Lin
8e58a69d32 Merge pull request #15615 from LiteralMushroom/patch-6
Makes it so synths spark when they *blush or *cry, instead of just IPCs.
2022-05-12 20:11:45 +00:00
LiteralMushroom
cfce371c8a You can now actually select a wing color. 2022-05-11 16:06:17 -04:00
LiteralMushroom
e59824fe26 in different files? 2022-05-09 19:32:13 -04:00
LiteralMushroom
626ab0fb2b why are these 2022-05-09 19:29:32 -04:00
SandPoot
90eab441aa Upload files 2022-05-09 18:50:17 -03:00
LiteralMushroom
dd4aa993df wings/deco_wings isn't a real category
fuck
2022-05-07 15:10:27 -04:00