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
|
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 |
|
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 |
|
Lin
|
d287f44d9a
|
Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
|
2020-08-16 20:20:03 -05:00 |
|
Hatterhat
|
bc0ca30647
|
there is no cooldown, press G
|
2020-08-16 15:45:11 -05: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 |
|
DeltaFire
|
e611023114
|
FUCK
|
2020-08-16 02:53:29 +02:00 |
|
silicons
|
b2c65e34fc
|
Merge pull request #13157 from kiwedespars/nullrod-nerf
chaplain nullrod nerf
|
2020-08-15 08:00:43 -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 |
|
Lin
|
2fa0b4ae6c
|
Merge pull request #13105 from silicons/underwear_412
ports binder bras from rp
|
2020-08-14 13:03:25 -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 |
|
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 |
|
Lin
|
d770e29114
|
Merge pull request #13145 from LetterN/patch-1
makes sleepers use the proper state
|
2020-08-14 12:58:31 -05: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 |
|
Sishen
|
bb94bf25fb
|
e
|
2020-08-13 21:39:00 -06:00 |
|
timothyteakettle
|
8b4fb136b2
|
ok fuck it
|
2020-08-14 02:37:08 +01:00 |
|
timothyteakettle
|
a9caceb001
|
insect fluff!
|
2020-08-14 02:27:54 +01:00 |
|
Lin
|
0c9facf6b5
|
Merge pull request #13151 from Citadel-Station-13/silicons-patch-11
why did we comment out abductor batons from being buyable
|
2020-08-13 18:51:39 -05:00 |
|
silicons
|
a51518f2c6
|
Update console.dm
|
2020-08-13 15:41:04 -07:00 |
|
silicons
|
6d93f15ad3
|
Update orderable_gear.dm
|
2020-08-13 15:40:13 -07:00 |
|
Lin
|
b72c08b169
|
Merge pull request #13137 from Citadel-Station-13/silicons-patch-9
listed_turf is now O(n) average case instead of O(n^2)
|
2020-08-13 17:33:08 -05:00 |
|
Hatterhat
|
d5b788a655
|
shortparry window restored, glaive parry req wield
|
2020-08-12 23:33:59 -05:00 |
|
Letter N
|
3ff770b38f
|
wrong state
|
2020-08-13 12:13:42 +08:00 |
|
Letter N
|
2eb6eb5032
|
state moment
|
2020-08-13 12:01:36 +08:00 |
|
silicons
|
b931b450ac
|
Update nanite_cloud_controller.dm
|
2020-08-12 17:18:56 -07:00 |
|
silicons
|
bb29d85983
|
Update nanite_programmer.dm
|
2020-08-12 17:18:40 -07:00 |
|
silicons
|
cd95685eaa
|
Update nanite_program_hub.dm
|
2020-08-12 17:18:06 -07:00 |
|
Timothy Teakettle
|
e5d48e307a
|
woops
|
2020-08-12 17:04:37 +01:00 |
|
Timothy Teakettle
|
82298fd56c
|
yes
|
2020-08-12 17:03:23 +01:00 |
|
silicons
|
d2773456f0
|
Update mob.dm
|
2020-08-12 08:33:06 -07:00 |
|
Letter N
|
081f07e259
|
bye!
|
2020-08-12 16:38:36 +08:00 |
|
silicons
|
3e67fd11e8
|
Update chair.dm
|
2020-08-11 23:39:31 -07:00 |
|
lolman360
|
3aba9eb5a6
|
kee
|
2020-08-12 15:11:55 +10:00 |
|
silicons
|
569cef0e42
|
Update ethereal.dm
|
2020-08-11 17:05:32 -07:00 |
|
timothyteakettle
|
2a6490b60c
|
yes
|
2020-08-12 00:47:06 +01:00 |
|
timothyteakettle
|
cd8430a897
|
woops
|
2020-08-12 00:42:51 +01:00 |
|
timothyteakettle
|
a2721b1ccd
|
traits
|
2020-08-12 00:40:49 +01:00 |
|
silicons
|
130c3a9480
|
Merge pull request #13096 from Michiyamenotehifunana/possum
Ports Opossums from Desert Rose
|
2020-08-11 16:19:42 -07:00 |
|
Lin
|
ddb3db5796
|
Merge pull request #13114 from Citadel-Station-13/silicons-patch-1
"it'll be fine Sables, nothing bad will happen if we remove the /mob blacklist from radiation"
|
2020-08-11 18:10:01 -05:00 |
|
ancientpower
|
99d73388f8
|
lets ghosts see the contents of closets
|
2020-08-11 16:40:03 -05:00 |
|