qweq12yt
781a414c38
fix space heaters
2021-09-15 18:16:04 -03: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
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
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
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
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
8904950cf5
Gremlinfix
2021-09-05 14:35:38 -04:00
keronshb
ea3b248e6c
Ports Parade outfit changes
2021-09-05 14:17:52 -04:00
Lin
12146fbff8
Merge pull request #15049 from keronshb/vrfix
...
Fixes Entering an already occupied VR Sleeper
2021-09-03 13:56:19 -05:00
Lin
cf99861886
Merge pull request #15061 from Hatterhat/tooltips-nauseated
...
theoretically makes mob examine tooltips respect examine tooltips pref
2021-09-03 13:56:05 -05:00
Lin
3b10346961
Merge pull request #15067 from timothyteakettle/fixes-synth-markings
...
makes the arm/leg markings for synthetic lizards appear as an option again
2021-09-03 13:52:15 -05:00
Putnam3145
2692f6285f
Fixes a runtime in ghost update_icon
...
Please make sure that no overrides have arguments when you add a new argument to a method.
2021-09-03 01:21:21 -07:00
Lin
9b888c7b01
Merge pull request #15059 from timothyteakettle/language-fixies
...
fixes losing your additional language upon changing species
2021-09-02 16:37:43 -05:00
Timothy Teakettle
cd04aed49e
Update synthliz.dm
2021-09-02 18:35:52 +01:00
zerothebigboy
5206524dd4
gommit
2021-09-02 07:38:48 -04:00
zerothebigboy
9f4f099880
gommit
2021-09-02 03:05:23 -04:00
Hatterhat
f93722cc85
gentlemen i've done it.
2021-09-01 17:49:19 -05:00
timothyteakettle
a33a7ed249
fix
2021-09-01 17:54:14 +01:00
zerothebigboy
30134a0d2f
cool
2021-09-01 06:32:33 -04:00
zerothebigboy
d831a84195
cool
2021-09-01 05:15:22 -04:00