1092eacc6e
Merge pull request #13397 from ArchieBeepBoop/microfans
...
Micro Powered Fans!
2020-09-27 00:03:43 -07:00
f9c7e1757f
Automatic changelog generation for PR #13286 [ci skip]
2020-09-27 02:01:03 -05:00
00ab73d0a3
Merge pull request #13286 from timothyteakettle/heterochromia
...
heterochromia: you can select individual eye colours
2020-09-27 00:01:00 -07:00
9b0d1bcac3
Automatic changelog compile [ci skip]
2020-09-27 00:15:06 +00:00
c8d899adb4
Automatic changelog generation for PR #13433 [ci skip]
2020-09-26 13:27:35 -05:00
4314159ab3
Merge pull request #13433 from SiliconMain/patch-7
...
Makes holosigns uncontaminable
2020-09-26 11:27:33 -07:00
4ce4cd3ed1
Merge pull request #13435 from Citadel-Station-13/halohair
...
Fixes missing hair when wearing halo
2020-09-25 22:07:36 -05:00
2ad1ca9ea2
Automatic changelog compile [ci skip]
2020-09-26 00:14:41 +00:00
89557a8ee3
Update custom_items.dm
2020-09-25 10:46:43 -05:00
8fef121064
Fixes missing hair when wearing halo
2020-09-25 10:45:13 -05:00
84f240c5dd
Update holosign.dm
2020-09-25 09:50:08 -05:00
d18e47d9e1
Automatic changelog generation for PR #13426 [ci skip]
2020-09-24 23:40:43 -05:00
f6d9d4b535
Merge pull request #13426 from CoreFlare/master
...
Gives IPCs hair.
2020-09-24 21:40:41 -07:00
c31366f2a7
Automatic changelog compile [ci skip]
2020-09-25 00:15:08 +00:00
106b8ccead
Merge branch 'master' into heterochromia
2020-09-24 22:09:03 +01:00
d5f4f04736
Automatic changelog generation for PR #13430 [ci skip]
2020-09-24 08:15:29 -05:00
a1b5c9fa47
Merge pull request #13430 from Putnam3145/removeRemoveNullsFromList
...
Removes removeNullsFromList, cause it doesn't work.
2020-09-24 06:15:25 -07:00
6f6e330984
Removes removeNullsFromList, cause it doesn't work.
2020-09-24 01:15:22 -07:00
0e867f37e6
Automatic changelog compile [ci skip]
2020-09-24 00:15:22 +00:00
a08baf782c
Automatic changelog generation for PR #13380 [ci skip]
2020-09-23 16:40:00 -05:00
7ca1b1dc79
Merge pull request #13380 from Putnam3145/cache-locality-experiments
...
(TESTMERGE THIS FIRST WOW) Made monstermos faster and more convenient
2020-09-23 14:39:56 -07:00
c41add450a
Merge pull request #13425 from Arturlang/TGUI_Updoot
...
Fixes some statpanel Issues
2020-09-23 14:19:22 -07:00
1901677fdb
finally. species_traits=list(HAIR)
2020-09-23 19:11:34 +01:00
e483cf06b3
fIXD
2020-09-23 19:54:30 +03:00
d493886875
Speedmerge fix
2020-09-23 19:14:50 +03:00
66db3c57d5
Automatic changelog compile [ci skip]
2020-09-23 00:14:22 +00:00
2e877b8c50
Hardcoded fusion scan results as "fusion" to fix a runtime.
...
It didn't need to be id anyway??
2020-09-22 00:23:13 -07:00
b5685852a6
Merge pull request #13393 from Citadel-Station-13/customskirt
...
[Ready] Donator Item - Custom Skirt
2020-09-21 22:48:21 -05:00
3864f14843
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into customskirt
2020-09-21 22:19:45 -05:00
665610c559
Automatic changelog compile [ci skip]
2020-09-22 00:14:38 +00:00
e89e7adda4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments
2020-09-21 03:31:35 -07:00
21903d3a24
Automatic changelog generation for PR #13329 [ci skip]
2020-09-21 05:11:11 -05:00
90aa47f339
Merge pull request #13329 from Arturlang/TGUI_Updoot
...
TGUI updates + statpanel
2020-09-21 03:11:06 -07:00
410550220b
Fixed admin hide most verbs
2020-09-21 10:39:09 +03:00
2ebb3b4d47
Automatic changelog generation for PR #13402 [ci skip]
2020-09-20 23:30:11 -05:00
8de3bcb08f
Merge pull request #13402 from timothyteakettle/limbs
...
copying prefs always regenerates icons now (attempt to stop preview icons being outright wrong)
2020-09-20 21:30:08 -07:00
bd9d7add04
Automatic changelog generation for PR #13408 [ci skip]
2020-09-20 23:24:12 -05:00
26eebf3b32
Merge pull request #13408 from YakumoChen/dont-be-a-dick-shinji
...
Get in the damn robot, Skylar
2020-09-20 21:24:08 -07:00
e2403bb84d
Automatic changelog compile [ci skip]
2020-09-21 00:15:18 +00:00
435565f1d8
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
2020-09-21 00:16:12 +03:00
16430dab4c
Merge pull request #13410 from Citadel-Station-13/doniconfix
...
added wrong state for halo and skirt, fixed with this
2020-09-19 18:46:26 -07:00
b69c467047
added wrong state for halo and skirt, fixed with this
2020-09-19 20:19:49 -05:00
997d5c8598
Automatic changelog compile [ci skip]
2020-09-20 00:15:13 +00:00
a3bf4ac580
Fixes requested
2020-09-19 13:02:08 -03:00
67cc7ea04e
getting annoying
2020-09-19 10:02:34 -05:00
b29143ea03
Merge pull request #13364 from Citadel-Station-13/silicons-patch-34
...
projectile process invoke async because people keep breaking shit and trying to enforce do not sleep on it is a moot point because people keep breaking shit
2020-09-19 16:53:55 +02:00
d0701ddcc0
Automatic changelog generation for PR #13382 [ci skip]
2020-09-19 08:07:07 -05:00
62228905da
Merge pull request #13382 from Citadel-Station-13/silicons-patch-36
...
hulks no longer break their hand from punching a wall
2020-09-19 06:07:04 -07:00
9c305d1db6
Merge pull request #13400 from silicons/shields
...
adds two procs to find exterior tiles for projecting hull shields around for later pr
2020-09-19 06:06:46 -07:00
ccbacfb0bf
Merge pull request #13403 from Citadel-Station-13/silicons-patch-38
...
fixes joystick users getting kicked for hacking. again.
2020-09-19 06:05:25 -07:00
silicons