silicons
8d72664eef
Merge pull request #15123 from keronshb/hitbyfix
...
Fixes a runtime with Hitby
2021-09-12 20:58:09 -07:00
zerothebigboy
d41648b365
dumbasskevinz
2021-09-11 23:34:02 -04:00
zerothebigboy
223ba8d6c1
why
2021-09-11 23:20:01 -04:00
zerothebigboy
f077f374bd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into why
2021-09-11 23:04:48 -04:00
zerothebigboy
ba72e3d8f0
why
2021-09-11 23:04:21 -04:00
keronshb
4cb198fe05
Fixes Hitby runtime
2021-09-11 17:38:32 -04:00
silicons
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
Letter N
de4311e4d9
shut up
2021-09-11 12:50:06 +08:00
silicons
fd785c6abf
Merge pull request #15063 from zeroisthebiggay/intern
...
ports various tg armor resprites and some such
2021-09-10 00:16:54 -07:00
silicons
4836f222d0
Merge pull request #15097 from LetterN/generic-housekeeping-pr
...
Generic syncs
2021-09-10 00:16:25 -07:00
Lin
4883a93da1
Merge pull request #15092 from lolman360/patch-1
...
allows autohydro trays to be manually filled
2021-09-09 20:21:40 -05:00
Lin
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
Lin
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
Lin
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
silicons
c600fae409
Merge pull request #15103 from SandPoot/cyborg-grippers
...
Does some nice stuff on cyborg grippers
2021-09-09 17:59:47 -07:00
Lin
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
Lin
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
silicons
ead04910c2
Update preferences_savefile.dm ( #15108 )
2021-09-09 18:23:01 +02:00
zerothebigboy
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
silicons
448199665d
Update research.dm
2021-09-08 23:10:24 -07:00
keronshb
4f54c465b2
ReebeReturns ( #15056 )
2021-09-09 06:17:00 +02:00
silicons
69bd477a72
Merge pull request #15039 from keronshb/gradiantport
...
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
silicons
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
silicons
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
2002532e1f
Merge pull request #15090 from Putnam3145/making-lavaland-atmos-better
...
Removes flammable gases from planet atmos
2021-09-08 20:39:39 -07:00
silicons
9968d92bdc
Merge pull request #15089 from keronshb/maskofmadness
...
Mask of Madness no longer wallhacks
2021-09-08 20:39:30 -07:00
silicons
7eaec9f6cc
Merge pull request #15095 from Putnam3145/thread-MC
...
Allow atmos thread to slow itself down
2021-09-08 20:39:09 -07:00
Putnam3145
5eb272c0a6
Makes it so zaps don't explode pipes
2021-09-08 18:42:38 -07:00
SandPoot
759852a31d
Update inventory.dm
2021-09-08 20:02:23 -03:00
SandPoot
37e2470616
Upload files
2021-09-08 19:53:47 -03:00
Timothy Teakettle
ccebece42e
icecream
2021-09-08 18:18:27 +01:00
silicons
7d62753fe4
Update living_active_parry.dm
2021-09-08 04:44:36 -07:00
silicons
5de5be462f
Update colossus.dm
2021-09-08 02:36:40 -07:00
silicons
d4d5af72dd
Update status_effects.dm
2021-09-07 20:45:52 -07:00
LetterN
688c8b8a90
what an idiot. properly fixes eco out at roundend
2021-09-08 11:06:13 +08:00
LetterN
d08cd16752
fix
2021-09-08 10:56:20 +08:00
LetterN
1ba8f25410
byond no likey :(
2021-09-08 10:35:41 +08:00
LetterN
e94725344b
extool based reftracking
2021-09-08 10:30:35 +08:00
LetterN
aca22e913b
reftrack ae
2021-09-08 10:26:48 +08:00
LetterN
12ae614833
fix1
2021-09-08 10:22:55 +08:00
LetterN
93332462f3
unit test update
2021-09-08 10:08:20 +08:00
LetterN
6739e349a0
heretics LOVES this - Also ian's birthday!
2021-09-08 09:50:07 +08:00
LetterN
c25dc84da0
what the cat doing with the yarn dependencies??
2021-09-08 09:25:38 +08:00
LetterN
e203abb25c
generic controller update
2021-09-08 09:10:28 +08:00
silicons
829884073f
stuff
2021-09-07 16:35:56 -07:00
Putnam3145
f04b0a68d2
division by zero, oh dear
2021-09-07 12:44:38 -07:00
Putnam3145
66fea518b8
Allow atmos thread to slow itself down
2021-09-07 12:30:54 -07:00
lolman360
829881defe
Update autohydro.dm
2021-09-07 17:16:31 +10:00
silicons
11b07e3ddc
Merge pull request #15083 from keronshb/outlinefix
...
FIX Ghosts can no longer highlight your inventory
2021-09-07 00:07:03 -07:00
silicons
fd67801d3b
Merge pull request #15080 from keronshb/paradeport
...
PORT Adds new outfits for command and centcom staff!
2021-09-07 00:06:50 -07:00