Timothy Teakettle
|
60c8dd283e
|
shitcode begone
|
2020-08-22 20:02:36 +01:00 |
|
Timothy Teakettle
|
bc16a8f1b2
|
fix lizard snouts
|
2020-08-20 16:39:07 +01:00 |
|
silicons
|
5414a8949c
|
Update text.dm
|
2020-08-19 08:50:26 -07:00 |
|
DeltaFire
|
7a9796e782
|
minmax torture
|
2020-08-19 17:05:27 +02:00 |
|
silicons
|
747c2af995
|
Merge pull request #13210 from Hatterhat/pirate-bruh-moment
>pirate announce metabreaks >in the year of our Lord 2020
|
2020-08-19 06:59:36 -07:00 |
|
Hatterhat
|
0c4a3c740d
|
>metabreaks >2020
|
2020-08-18 21:50:57 -05:00 |
|
Putnam3145
|
cc99a89027
|
Merge pull request #13206 from Citadel-Station-13/silicons-patch-18
[s] xss
|
2020-08-18 19:24:14 -07:00 |
|
Letter N
|
fa7b82694d
|
src.islazy = TRUE
|
2020-08-19 10:04:56 +08:00 |
|
Letter N
|
b59d449a75
|
Update adminhelp.dm
|
2020-08-19 09:59:41 +08:00 |
|
silicons
|
48652e4b0a
|
Merge pull request #13202 from tiramisuapimancer/master
Makes Ethereal hair their mutcolor instead of white
|
2020-08-18 18:53:40 -07:00 |
|
silicons
|
0331f0cdc3
|
Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum
Revert "[TESTMERGE ONLY] FUCK"
|
2020-08-18 18:52:52 -07:00 |
|
silicons
|
ce80f64d27
|
Update suppression.dm
|
2020-08-18 18:52:06 -07:00 |
|
tiramisuapimancer
|
13609ba6e6
|
Update ethereal.dm
|
2020-08-17 23:01:01 -08:00 |
|
timothyteakettle
|
d312a5d639
|
fix tails
|
2020-08-18 01:32:06 +01:00 |
|
timothyteakettle
|
47424be1c0
|
tail fix
|
2020-08-18 00:46:05 +01:00 |
|
silicons
|
d35cba095f
|
Merge pull request #13108 from Hatterhat/357-dumdum
.357 DumDum Rounds (they're adminspawn only don't worry)
|
2020-08-17 08:58:00 -07:00 |
|
silicons
|
3d69f65c6b
|
Merge pull request #13185 from Hatterhat/large-demons
slaughter demons to MOB_SIZE_LARGE
|
2020-08-17 03:15:16 -07:00 |
|
silicons
|
7d2d4d870c
|
Merge pull request #13179 from Detective-Google/if-chain-begoen
kills an ugly if-chain in inventory code (probably)
|
2020-08-17 03:13:48 -07:00 |
|
Putnam3145
|
23b4ba3714
|
Merge pull request #13063 from silicons/supermatter
Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
|
2020-08-17 03:13:14 -07:00 |
|
Timothy Teakettle
|
f5300750b5
|
Revert "[TESTMERGE ONLY] FUCK"
|
2020-08-17 03:18:36 +01:00 |
|
silicons
|
4cd731ce11
|
Revert "cease your shitcode: cum edition"
|
2020-08-16 19:06:57 -07:00 |
|
silicons
|
8dedcbcf76
|
Merge branch '13113'
|
2020-08-16 18:53:35 -07:00 |
|
silicons
|
1f0f5d621a
|
Merge branch '13176'
|
2020-08-16 18:52:48 -07:00 |
|
silicons
|
83b41b1a0f
|
Merge branch '13174'
|
2020-08-16 18:52:33 -07:00 |
|
silicons
|
384e5ae311
|
Merge branch '13167'
|
2020-08-16 18:51:48 -07:00 |
|
silicons
|
a1a26d6941
|
Merge branch '13159'
|
2020-08-16 18:51:07 -07:00 |
|
silicons
|
66322c4d38
|
Merge branch '13156'
|
2020-08-16 18:50:29 -07:00 |
|
silicons
|
451d5e52de
|
Merge branch '13148'
|
2020-08-16 18:49:57 -07:00 |
|
silicons
|
b8686ab0f9
|
Update _vehicle.dm
|
2020-08-16 18:49:49 -07:00 |
|
silicons
|
bc1fad653b
|
Merge branch '13147'
|
2020-08-16 18:48:57 -07:00 |
|
silicons
|
b767c99bac
|
Merge branch '13144'
|
2020-08-16 18:48:14 -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
|
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
|
89b71ddfc5
|
first and only occupant gets dinked
|
2020-08-16 15:02:04 -05:00 |
|
Hatterhat
|
57e01902c5
|
density is kill
|
2020-08-16 14:53:19 -05:00 |
|
Hatterhat
|
07e44a176d
|
tempted to just remove the density tbqh
|
2020-08-16 14:52:34 -05:00 |
|
Hatterhat
|
88437bdea7
|
breakdown breakdown
|
2020-08-16 14:27:10 -05:00 |
|
kiwedespars
|
7c653d0891
|
i actually kinda like the idea that you need a point for paths.
- whoops actually increases stamdamage of mansus grasp to 60.
- ascensions bumped up to 5 each.
- recipe for a codex made a bit harder.
|
2020-08-16 04:34:04 -07: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 |
|
Detective Google
|
9b943ec7a9
|
yee
|
2020-08-15 21:29:39 -05:00 |
|
DeltaFire
|
e611023114
|
FUCK
|
2020-08-16 02:53:29 +02:00 |
|