Commit Graph

37276 Commits

Author SHA1 Message Date
Letter N
317480a3e7 something something skin texture revert. oh and oh fuck shit passkeys works again. 2020-08-22 15:07:02 +08:00
Letter N
08120ae8b9 TGUI built! 2020-08-22 13:47:20 +08:00
Letter N
afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
Letter N
014e00d1a6 cogchamp changes. syncing then building tgui next 2020-08-22 13:35:34 +08:00
Letter N
a38aca4da6 tgui moment. 2020-08-22 13:11:13 +08:00
Changelogs
559c0d7024 Automatic changelog compile [ci skip] 2020-08-22 00:12:22 +00:00
Letter N
f04918bdca working code? 2020-08-21 15:09:49 +08:00
CitadelStationBot
a9ce548755 Automatic changelog generation for PR #13178 [ci skip] 2020-08-20 23:32:29 -05:00
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
2020-08-20 21:32:26 -07:00
Changelogs
eb2dadfd0d Automatic changelog compile [ci skip] 2020-08-21 00:12:48 +00:00
CitadelStationBot
91764493fe Automatic changelog generation for PR #13223 [ci skip] 2020-08-20 15:58:57 -05:00
Timothy Teakettle
88fb9d277a fix lizard snouts (#13223) 2020-08-20 22:58:54 +02:00
Letter N
8d70e21239 the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it. 2020-08-20 19:40:47 +08:00
Letter N
2dd3d71b19 config&copypaste chang. 2020-08-20 16:36:24 +08:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
CitadelStationBot
ce10f90b1c Automatic changelog generation for PR #13212 [ci skip] 2020-08-20 00:03:19 -05:00
silicons
11467e1cae Merge pull request #13212 from Putnam3145/reftrack
Ports reftracking from TG.
2020-08-19 22:03:16 -07:00
CitadelStationBot
b2f16d794d Automatic changelog generation for PR #13211 [ci skip] 2020-08-19 23:11:15 -05:00
silicons
9de7a854b5 Merge pull request #13211 from LetterN/patch-3
Updates tips
2020-08-19 21:11:12 -07:00
CitadelStationBot
d12cb37d88 Automatic changelog generation for PR #13183 [ci skip] 2020-08-19 23:04:01 -05:00
silicons
91484356c5 Merge pull request #13183 from SmArtKar/shuttle_hotfix
Shuttle hotfix so now you can make huge shuttle things
2020-08-19 21:03:58 -07:00
silicons
0e2e4fdaf7 Merge pull request #13199 from lolman360/haha
[READY] tested code
2020-08-19 21:03:21 -07:00
CitadelStationBot
23648a0c44 Automatic changelog generation for PR #13208 [ci skip] 2020-08-19 21:56:16 -05:00
silicons
8a1cf1b860 Merge pull request #13208 from timothyteakettle/fuck
fixes two snout paths
2020-08-19 19:56:12 -07:00
Changelogs
a0823ea54b Automatic changelog compile [ci skip] 2020-08-20 00:14:25 +00: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
lolman360
1654a925b6 Update smoke_machine.dm 2020-08-19 18:26:53 +10:00
lolman360
e82772dc44 kekw 2020-08-19 17:22:52 +10:00
Putnam
81dc6c7ee5 Ports reftracking from TG. 2020-08-18 20:41:43 -07:00
Letter N
8de7717b52 wounds moment 2020-08-19 11:01:38 +08: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
lolman360
ee4da21d38 Merge branch 'haha' of https://github.com/lolman360/Citadel-Station-13 into haha 2020-08-19 12:20:38 +10:00
lolman360
f35989b09e Merge remote-tracking branch 'upstream/master' into haha 2020-08-19 12:20:07 +10:00
timothyteakettle
b40a42209d fixes two snout paths 2020-08-19 03:19:51 +01: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
lolman360
5306da7938 Update code/modules/projectiles/guns/ballistic.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-08-19 12:02:53 +10:00
lolman360
09bba25050 Update code/modules/projectiles/boxes_magazines/_box_magazine.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-08-19 12:02:45 +10:00
lolman360
a7a964154e Update code/modules/projectiles/boxes_magazines/_box_magazine.dm
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
2020-08-19 12:02:34 +10: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