baa8d26428
Update holy_weapons.dm
2021-09-12 20:03:26 -07:00
c038529677
Update holy_weapons.dm
2021-09-12 19:55:20 -07:00
45895c52e6
Automatic changelog compile [ci skip]
2021-09-13 00:27:21 +00:00
1bce3461ec
Automatic changelog compile [ci skip]
2021-09-12 00:27:13 +00:00
0e944f5363
Automatic changelog generation for PR #15102 [ci skip]
2021-09-11 00:17:27 -05:00
149d149dff
Merge pull request #15102 from timothyteakettle/icecream
...
allows custom taste text and color on the custom ice cream setting in the ice cream vat
2021-09-10 22:17:25 -07:00
8152d84f94
Automatic changelog generation for PR #15122 [ci skip]
2021-09-11 00:17:10 -05:00
6b17f53118
Merge pull request #15122 from LetterN/patch-10
...
possibly fixes arc blasting loud sfx
2021-09-10 22:17:08 -07:00
368bc3e45b
Automatic changelog generation for PR #15121 [ci skip]
2021-09-11 00:17:02 -05:00
9ccb105e98
Merge pull request #15121 from LetterN/WHO-BROKE-THIS-THEME-REEEEEE
...
fixes cwc tgui theme
2021-09-10 22:16:59 -07:00
de4311e4d9
shut up
2021-09-11 12:50:06 +08:00
1d53bf2094
i forgot
2021-09-11 12:39:32 +08:00
237fdb9893
Merge pull request #15118 from Putnam3145/another-auxmos-fix
...
Another auxmos fix
2021-09-10 18:17:01 -07:00
9b83dc94bb
Another auxmos fix
2021-09-10 18:00:39 -07:00
ad95f4cb56
Automatic changelog compile [ci skip]
2021-09-11 00:25:09 +00:00
eae147f6a3
Automatic changelog generation for PR #15063 [ci skip]
2021-09-10 02:16:57 -05:00
fd785c6abf
Merge pull request #15063 from zeroisthebiggay/intern
...
ports various tg armor resprites and some such
2021-09-10 00:16:54 -07:00
8c845134fb
Automatic changelog generation for PR #15097 [ci skip]
2021-09-10 02:16:28 -05:00
4836f222d0
Merge pull request #15097 from LetterN/generic-housekeeping-pr
...
Generic syncs
2021-09-10 00:16:25 -07:00
4883a93da1
Merge pull request #15092 from lolman360/patch-1
...
allows autohydro trays to be manually filled
2021-09-09 20:21:40 -05:00
9efb28c208
Merge pull request #15107 from Citadel-Station-13/silicons-patch-8
...
makes techweb error nodes stack trace
2021-09-09 20:08:48 -05:00
a1a6414777
Merge pull request #15096 from Citadel-Station-13/movespeed
...
Tweaks reagent speedups and taser slowdowns and fixes stabilzied light pink for those xenobio people
2021-09-09 20:08:35 -05:00
43faf70d6a
Merge pull request #15088 from Citadel-Station-13/silicons-patch-4
...
how did no one notice ephedrine (see: every painkiller speedup buff which uses the same system) was broken until i abused it and got to be the beta tester?
2021-09-09 20:08:22 -05:00
1e30ed46dc
Automatic changelog generation for PR #15103 [ci skip]
2021-09-09 19:59:50 -05:00
c600fae409
Merge pull request #15103 from SandPoot/cyborg-grippers
...
Does some nice stuff on cyborg grippers
2021-09-09 17:59:47 -07:00
0387a3dd2d
Automatic changelog generation for PR #15111 [ci skip]
2021-09-09 19:59:08 -05:00
19db32bf22
Merge pull request #15111 from Putnam3145/update-auxmos-again
...
Updates auxmos not to crash
2021-09-09 17:59:05 -07:00
0d6ed307fe
Automatic changelog generation for PR #15110 [ci skip]
2021-09-09 19:58:25 -05:00
bf08d7e8f2
Merge pull request #15110 from timothyteakettle/arachnid-legs
...
arachnid legs now show up properly
2021-09-09 17:58:23 -07:00
0a005438ab
Merge pull request #15100 from Citadel-Station-13/silicons-patch-5
...
salt fixes colossus crystals not reading direction anymore due to a projectile update
2021-09-09 19:51:05 -05:00
16957aa6b6
Automatic changelog compile [ci skip]
2021-09-10 00:28:22 +00:00
3f09f56e3d
Merge pull request #15101 from Citadel-Station-13/silicons-patch-6
...
fixes the comedy antag parry gauntlets
2021-09-09 19:10:51 -05:00
9d4d50fc5e
Updates auxmos not to crash
2021-09-09 10:46:06 -07:00
65e942ef4e
Update arachnid_parts.dmi
2021-09-09 18:15:29 +01:00
ead04910c2
Update preferences_savefile.dm ( #15108 )
2021-09-09 18:23:01 +02:00
bae9ede2ea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern
2021-09-09 08:20:05 -04:00
eca14faa92
Merge pull request #15065 from zeroisthebiggay/vesties
...
ports tg hazard vest
2021-09-09 05:19:27 -07:00
f14186cec2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vesties
2021-09-09 08:17:53 -04:00
c7e16aabf8
ihatekeroncoats
2021-09-09 04:56:42 -04:00
5a8a069cd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern
...
# Conflicts:
# icons/mob/clothing/suit.dmi
# icons/mob/clothing/suit_digi.dmi
# icons/obj/clothing/suits.dmi
2021-09-09 04:49:30 -04:00
448199665d
Update research.dm
2021-09-08 23:10:24 -07:00
6b503904a7
Merge pull request #15093 from LetterN/patch-9
...
Readme Update
2021-09-08 21:45:17 -07:00
23e10d2fe6
Automatic changelog generation for PR #15056 [ci skip]
2021-09-08 23:17:03 -05:00
4f54c465b2
ReebeReturns ( #15056 )
2021-09-09 06:17:00 +02:00
cb4ba0b02a
Automatic changelog generation for PR #15039 [ci skip]
2021-09-08 22:41:03 -05:00
69bd477a72
Merge pull request #15039 from keronshb/gradiantport
...
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
baa7bd0d5e
Automatic changelog generation for PR #15043 [ci skip]
2021-09-08 22:40:43 -05:00
82103d8c15
Merge pull request #15043 from BlueWildrose/dropitlikeitshot
...
CTRL + (combat mode) Right Click - positional dropping and item rotation
2021-09-08 20:40:41 -07:00
eb88527b6b
Automatic changelog generation for PR #15058 [ci skip]
2021-09-08 22:40:23 -05:00
bb7ee63eae
Merge pull request #15058 from zeroisthebiggay/headass
...
the unatomized hypospray/medbay tools/emergency kits resprite
2021-09-08 20:40:20 -07:00
silicons