silicons
|
59f2d1ea75
|
Merge branch '13142'
|
2020-08-16 18:47:07 -07:00 |
|
silicons
|
38959b6120
|
Merge branch '13141'
|
2020-08-16 18:46:33 -07:00 |
|
silicons
|
9602f0742e
|
Merge branch '13135'
|
2020-08-16 18:46:06 -07:00 |
|
silicons
|
b7b13403b9
|
Merge branch '13130'
|
2020-08-16 18:45:54 -07:00 |
|
silicons
|
397cdb6c03
|
Merge branch '13129'
|
2020-08-16 18:45:35 -07:00 |
|
silicons
|
fe7d8860f5
|
Merge branch '13124'
|
2020-08-16 18:45:23 -07:00 |
|
silicons
|
53fe2c95c5
|
Merge branch 'pr-13122'
|
2020-08-16 18:45:01 -07:00 |
|
silicons
|
b56742beb5
|
Merge branch 'pr-13110'
|
2020-08-16 18:40:23 -07:00 |
|
silicons
|
9c63a09907
|
Merge branch 'pr-13087'
|
2020-08-16 18:40:07 -07:00 |
|
silicons
|
01dd2f389b
|
Merge branch 'pr-13067'
|
2020-08-16 18:38:13 -07:00 |
|
silicons
|
fa11480781
|
Merge pull request #13109 from Detective-Google/sm-fix
adds more heatpipes to snaxi sm
|
2020-08-16 18:36:16 -07:00 |
|
CitadelStationBot
|
6f0c6ca88d
|
Automatic changelog generation for PR #13037 [ci skip]
|
2020-08-16 20:35:08 -05:00 |
|
silicons
|
428bb936aa
|
Merge pull request #13037 from timothyteakettle/freedom-in-customisation
turns 304 lines of snowflake code into 24 lines
|
2020-08-16 18:35:05 -07:00 |
|
CitadelStationBot
|
dbf065526a
|
Automatic changelog generation for PR #13092 [ci skip]
|
2020-08-16 20:20:32 -05:00 |
|
Lin
|
2fd3e2dd87
|
Merge pull request #13092 from Citadel-Station-13/silicons-patch-87
active blocking now also considers a stamina damaging projectile's stamina damage to be .. damage
|
2020-08-16 20:20:29 -05:00 |
|
CitadelStationBot
|
1be6b87897
|
Automatic changelog generation for PR #13045 [ci skip]
|
2020-08-16 20:20:07 -05:00 |
|
Lin
|
d287f44d9a
|
Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
|
2020-08-16 20:20:03 -05:00 |
|
Changelogs
|
7661a8c8b4
|
Automatic changelog compile [ci skip]
|
2020-08-17 00:12:25 +00:00 |
|
Hatterhat
|
bc0ca30647
|
there is no cooldown, press G
|
2020-08-16 15:45:11 -05:00 |
|
CitadelStationBot
|
d52a0ba982
|
Automatic changelog generation for PR #12739 [ci skip]
|
2020-08-15 23:07:21 -05:00 |
|
deathride58
|
bbc3909f68
|
Merge pull request #12739 from Strazyplus/DRAKEBORG
[READY] DRAKEBORGS & PLUSHIES
|
2020-08-16 00:07:18 -04:00 |
|
Navier
|
fc70d3dde2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG
|
2020-08-15 23:13:41 -04:00 |
|
Navier
|
2050984124
|
Merge branch 'master' of https://github.com/Strazyplus/Citadel-Station-13 into DRAKEBORG
|
2020-08-15 23:03:56 -04:00 |
|
CitadelStationBot
|
a279d14986
|
Automatic changelog generation for PR #13177 [ci skip]
|
2020-08-15 21:21:39 -05:00 |
|
Putnam3145
|
df451e78a9
|
Merge pull request #13177 from DeltaFire15/FUCK
[FUCK] Cogscarabs can no longer do very scary stuff
|
2020-08-15 19:21:36 -07:00 |
|
DeltaFire
|
e611023114
|
FUCK
|
2020-08-16 02:53:29 +02:00 |
|
Changelogs
|
204382781f
|
Automatic changelog compile [ci skip]
|
2020-08-16 00:30:11 +00:00 |
|
Changelogs
|
29aaa6c7ab
|
Automatic changelog compile [ci skip]
|
2020-08-16 00:12:26 +00:00 |
|
CitadelStationBot
|
02d0269a81
|
Automatic changelog generation for PR #13157 [ci skip]
|
2020-08-15 10:00:46 -05:00 |
|
silicons
|
b2c65e34fc
|
Merge pull request #13157 from kiwedespars/nullrod-nerf
chaplain nullrod nerf
|
2020-08-15 08:00:43 -07:00 |
|
CitadelStationBot
|
b5f4becd33
|
Automatic changelog generation for PR #13154 [ci skip]
|
2020-08-15 10:00:31 -05:00 |
|
silicons
|
d528e941c0
|
Merge pull request #13154 from zeroisthebiggay/justthetipplease
Rewrites, remakes, replaces, and improves several tips, also adds a couple more
|
2020-08-15 08:00:27 -07:00 |
|
silicons
|
90234ca065
|
Merge pull request #13155 from Sishen1542/we-in-the-hood
gives wintercoat hoods rad_no_contaminate flags
|
2020-08-14 18:19:45 -07:00 |
|
Changelogs
|
66400729c8
|
Automatic changelog compile [ci skip]
|
2020-08-15 00:12:03 +00:00 |
|
Lin
|
2fa0b4ae6c
|
Merge pull request #13105 from silicons/underwear_412
ports binder bras from rp
|
2020-08-14 13:03:25 -05:00 |
|
CitadelStationBot
|
0a2faa18ae
|
Automatic changelog generation for PR #13131 [ci skip]
|
2020-08-14 13:02:22 -05:00 |
|
Lin
|
cd89785bc9
|
Merge pull request #13131 from Citadel-Station-13/silicons-patch-6
gives ethereals underwear
|
2020-08-14 13:02:18 -05:00 |
|
Lin
|
b8ba29e6f8
|
Merge pull request #13117 from Citadel-Station-13/silicons-patch-3
fixes nanite hubs
|
2020-08-14 13:01:15 -05:00 |
|
Lin
|
ba9a808aaa
|
Merge pull request #13118 from Citadel-Station-13/silicons-patch-4
fixes nanite programmers not ejecting disks
|
2020-08-14 13:01:08 -05:00 |
|
Lin
|
266109ef45
|
Merge pull request #13119 from Citadel-Station-13/silicons-patch-5
fixes nanite cloud controllers not dropping disks
|
2020-08-14 13:00:44 -05:00 |
|
CitadelStationBot
|
0d930401a1
|
Automatic changelog generation for PR #13133 [ci skip]
|
2020-08-14 13:00:15 -05:00 |
|
Lin
|
e1774fb56f
|
Merge pull request #13133 from Citadel-Station-13/silicons-patch-7
clockwork chairs now keep spinning because it's no longer that laggy to maintain it since it's a processing system instead of while(TRUE) now
|
2020-08-14 13:00:12 -05:00 |
|
CitadelStationBot
|
762c696ab2
|
Automatic changelog generation for PR #13145 [ci skip]
|
2020-08-14 12:58:34 -05:00 |
|
Lin
|
d770e29114
|
Merge pull request #13145 from LetterN/patch-1
makes sleepers use the proper state
|
2020-08-14 12:58:31 -05:00 |
|
Lin
|
07a4789278
|
Merge pull request #13112 from silicons/cog
what the fuck is an energy gun
|
2020-08-14 12:57:48 -05:00 |
|
CitadelStationBot
|
5e64e5da3f
|
Automatic changelog generation for PR #13160 [ci skip]
|
2020-08-14 08:51:31 -05:00 |
|
silicons
|
e1db0031a6
|
Merge pull request #13160 from LetterN/fixes-missing-anom
Fixes missing icons for anomaly cores
|
2020-08-14 06:51:28 -07:00 |
|
Letter N
|
66c0f22d33
|
fixes missing icons
|
2020-08-14 21:21:43 +08:00 |
|
kiwedespars
|
61486f1287
|
adds custom parry data.
|
2020-08-14 01:59:46 -07:00 |
|
kiwedespars
|
53be29d9c2
|
Update dualsaber.dm
|
2020-08-14 01:43:47 -07:00 |
|