keronshb
b444afede3
ACTION BUTTON SLAM
2021-09-11 12:06:18 -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
LetterN
791da1b9b4
mafia update.
2021-09-11 11:38:15 +08:00
keronshb
0233f2123f
Slaughter Fix and Buff
2021-09-10 21:00:28 -04:00
zerothebigboy
68e2eb1d7a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
2021-09-10 12:12:57 -04:00
keronshb
bb74dd4adf
Cap fix
2021-09-10 12:01:46 -04: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
keronshb
5587cc91cd
Other fix
2021-09-09 21:56:58 -04: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
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
keronshb
8dfb97cdf7
SALTPR
2021-09-09 20:17:55 -04:00
keronshb
a2a8d74fd8
Vent and spawning
2021-09-09 20:12:47 -04: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
Putnam3145
cc2471cf7f
Reworked supermatter gas output
...
basically it's less likely to cause forever runaway trit fires... but it can still get runaway, it's just more power-based than temperature-based
2021-09-09 13:51:22 -07: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
69bd477a72
Merge pull request #15039 from keronshb/gradiantport
...
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -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
9968d92bdc
Merge pull request #15089 from keronshb/maskofmadness
...
Mask of Madness no longer wallhacks
2021-09-08 20:39:30 -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
Hatterhat
9dbcfa24a5
i only KINDA tested this
2021-09-07 22:28:04 -05: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
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
zerothebigboy
3c23a09b56
bannedforbeingcringeist
2021-09-07 21:10:24 -04:00
silicons
829884073f
stuff
2021-09-07 16:35:56 -07:00
lolman360
829881defe
Update autohydro.dm
2021-09-07 17:16:31 +10: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
silicons
7013958961
Update _movespeed_modifier.dm
2021-09-06 19:43:51 -07:00
keronshb
d4383cb507
Mask of madness viewers
2021-09-06 22:38:56 -04:00
silicons
9d999ff5cf
Update _movespeed_modifier.dm
2021-09-06 19:34:05 -07:00
keronshb
2808e855b5
Explosive Pop fix
2021-09-06 10:30:41 -04:00
keronshb
5102cacdb4
Prevents them from spawning off station z
2021-09-06 09:50:21 -04:00
keronshb
468a610f15
Corpsefix
2021-09-06 09:31:45 -04:00
keronshb
a8d1b377e4
Plaguefix
2021-09-05 21:22:53 -04:00
