Commit Graph

37181 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
Lin
63288afb72 Merge pull request #13216 from Citadel-Station-13/silicons-patch-21
[s] nanite moment
2020-08-19 10:50:56 -05:00
silicons
5414a8949c Update text.dm 2020-08-19 08:50:26 -07:00
CitadelStationBot
3d520782a3 Automatic changelog generation for PR #13214 [ci skip] 2020-08-19 10:36:05 -05:00
silicons
69d2d697e5 Merge pull request #13214 from DeltaFire15/cooking-oil-fix
[s] Min and max are two very distinct procs...
2020-08-19 08:36:02 -07:00
DeltaFire
7a9796e782 minmax torture 2020-08-19 17:05:27 +02:00
CitadelStationBot
1982ad5ed1 Automatic changelog generation for PR #13210 [ci skip] 2020-08-19 08:59:40 -05: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
CitadelStationBot
428d95b893 Automatic changelog generation for PR #13207 [ci skip] 2020-08-18 21:16:35 -05:00
silicons
7eec264f45 Merge pull request #13207 from LetterN/patch-2
[s] ports does the html admin thing in a better way probably
2020-08-18 19:16:31 -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
CitadelStationBot
6eac8800b6 Automatic changelog generation for PR #13202 [ci skip] 2020-08-18 20:53:42 -05: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
CitadelStationBot
ecff6bc36a Automatic changelog generation for PR #13194 [ci skip] 2020-08-18 20:53:24 -05: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
Changelogs
b50ccb980c Automatic changelog compile [ci skip] 2020-08-19 00:13:00 +00: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
Changelogs
20648fc1bb Automatic changelog compile [ci skip] 2020-08-18 00:12:17 +00:00
timothyteakettle
47424be1c0 tail fix 2020-08-18 00:46:05 +01:00
CitadelStationBot
0d3e95803c Automatic changelog generation for PR #13195 [ci skip] 2020-08-17 18:24:23 -05:00
silicons
7d5d2b969e Merge pull request #13195 from Detective-Google/hotfix
makes glass floors actually deconstructable
2020-08-17 16:24:19 -07:00
Detective Google
b13048f636 makes glass floors actually deconstructable 2020-08-17 12:15:09 -05:00
CitadelStationBot
f1b0e72676 Automatic changelog generation for PR #13108 [ci skip] 2020-08-17 10:58:04 -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
CitadelStationBot
c1a2d907f1 Automatic changelog generation for PR #13190 [ci skip] 2020-08-17 05:15:50 -05:00
silicons
d16a1ae301 Merge pull request #13190 from Detective-Google/art
adds art to ghost cafe
2020-08-17 03:15:47 -07:00
silicons
56d49aac2e Merge pull request #13186 from Detective-Google/telebort
a few snaxi improvements; chiefly labelling the telepads better.
2020-08-17 03:15:37 -07:00
CitadelStationBot
1889092914 Automatic changelog generation for PR #13185 [ci skip] 2020-08-17 05:15:20 -05: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
CitadelStationBot
5c8378a6f0 Automatic changelog generation for PR #13180 [ci skip] 2020-08-17 05:14:19 -05: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
CitadelStationBot
7a24842c0a Automatic changelog generation for PR #13179 [ci skip] 2020-08-17 05:13:51 -05: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
Detective Google
eed7e4ad02 also painting frames 2020-08-17 00:39:25 -05:00
Detective Google
ee7c528185 adds art to ghost cafe 2020-08-17 00:36:09 -05:00
Timothy Teakettle
f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
Lin
d285e9f005 Merge pull request #13187 from Citadel-Station-13/revert-13110-cum
[TESTMERGE ONLY] FUCK
2020-08-16 21:16:42 -05:00
silicons
4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
Detective Google
3ac272c9be a few other little cleanups while I'm opening a PR 2020-08-16 21:03:11 -05:00
Detective Google
83332453b6 clarifies a bit more where each pad goes on snaxi. 2020-08-16 21:01:09 -05:00