Commit Graph

16235 Commits

Author SHA1 Message Date
Letter N
b20f63ea21 absolute head empty moment 2020-08-22 17:11:53 +08:00
Letter N
271c66ad40 travis moment 2020-08-22 17:03:10 +08:00
Letter N
7a7a6fbe68 asset moment. 2020-08-22 16:41:13 +08:00
Letter N
0b159b218a revert moment 2020-08-22 16:30:56 +08:00
Letter N
6ba29acd4e uses some cit procs. and how the fuck did i forget to componentualize this 2020-08-22 16:08:05 +08:00
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
afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
Letter N
a38aca4da6 tgui moment. 2020-08-22 13:11:13 +08:00
Letter N
f04918bdca working code? 2020-08-21 15:09:49 +08: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
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
silicons
11467e1cae Merge pull request #13212 from Putnam3145/reftrack
Ports reftracking from TG.
2020-08-19 22:03:16 -07: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
silicons
8a1cf1b860 Merge pull request #13208 from timothyteakettle/fuck
fixes two snout paths
2020-08-19 19:56:12 -07: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
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
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
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
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
lolman360
9931cb006c eee 2020-08-18 17:33:20 +10:00
tiramisuapimancer
13609ba6e6 Update ethereal.dm 2020-08-17 23:01:01 -08:00
lolman360
d8e286d7be ee 2020-08-18 16:17:00 +10:00
lolman360
325f4eb72e Updates 2 2020-08-18 15:43:44 +10:00
lolman360
6f21b23a87 Fixes Shit. 2020-08-18 14:28:57 +10:00
lolman360
f2a86f2c42 Update medical_designs.dm 2020-08-18 14:23:09 +10:00
lolman360
8027706bea Update _box_magazine.dm 2020-08-18 13:45:44 +10:00
Letter N
5dff3e9a04 deletes ping 2020-08-18 11:35:10 +08:00
lolman360
2d1edc9fa2 Update _box_magazine.dm 2020-08-18 13:30:49 +10:00
lolman360
8356dbf20a Update medical_designs.dm 2020-08-18 13:26:32 +10:00
Letter N
83df9159de GOONCHAT IS DEAD! LONG LIVE THE KING! 2020-08-18 10:51:13 +08:00
Letter N
90cb13f6af Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-18 10:33:21 +08:00
lolman360
32c0335a17 Update medical_designs.dm 2020-08-18 10:35:56 +10:00