Commit Graph

24445 Commits

Author SHA1 Message Date
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
04a0c2be6c Merge pull request #13194 from DeltaFire15/slab-wiki
Updates the clockcult help link to link to our wiki.
2020-08-18 18:53:21 -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
Detective Google
b13048f636 makes glass floors actually deconstructable 2020-08-17 12:15:09 -05: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
DeltaFire
31f1e04654 updates the helpertext in general
Recollection doesn't actually offer any help anymore and just redirects you to the wiki anyways.
2020-08-17 17:03:53 +02:00
DeltaFire
c74803dd1a updates the wiki page link 2020-08-17 16:53:49 +02: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
f611945b34 Merge pull request #13180 from Detective-Google/glass-floors
ports multiz glass floors (tgstation/tgstation#50831)
2020-08-17 03:14:15 -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
ac7bdb5db5 Merge branch '13175' 2020-08-16 18:53:00 -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
2095e2705f Merge branch '13169' 2020-08-16 18:52:13 -07:00
silicons
690f610f62 Merge branch '13168' 2020-08-16 18:52:04 -07:00
silicons
384e5ae311 Merge branch '13167' 2020-08-16 18:51:48 -07:00
silicons
83e72b4f96 Merge branch '13164' 2020-08-16 18:51:36 -07:00
silicons
a900c07846 Merge branch '13163' 2020-08-16 18:51:24 -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
44e2327280 Merge branch '13143' 2020-08-16 18:47:48 -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