Commit Graph

19184 Commits

Author SHA1 Message Date
silicons
c7c74e7c51 Merge pull request #13213 from lolman360/breath
breath mask balaclava
2020-08-22 15:22:04 -07:00
silicons
68ee7b12bf Merge pull request #13236 from timothyteakettle/lizard-fixes
lizards are shitcode
2020-08-22 15:19:48 -07:00
silicons
a4aeb38433 Merge pull request #13221 from Ludox235/fuck-lowpop-xenos
>10 pop xenos >FOR (ALLEGEDLY) 5 YEARS
2020-08-22 15:19:21 -07:00
silicons
7737e76b32 Merge pull request #13224 from Ghommie/Ghommie-cit835
Removing priority overlays, update_icon() splitup for guns.
2020-08-22 15:19:07 -07:00
zerothebigboy
21836b4ec8 : ) 2020-08-22 18:11:03 -04:00
Hatterhat
8645a2954f tackle hando 2020-08-22 16:13:41 -05:00
Hatterhat
093928eab2 holopara buyonce 2020-08-22 15:46:14 -05:00
Hatterhat
236db857dc pda bomb buyonce 2020-08-22 15:42:20 -05:00
Timothy Teakettle
60c8dd283e shitcode begone 2020-08-22 20:02:36 +01:00
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
Hatterhat
5fcf537f57 fuck 2020-08-22 00:34:40 -05:00
Letter N
a38aca4da6 tgui moment. 2020-08-22 13:11:13 +08:00
Hatterhat
f59e627913 past tense moment 2020-08-21 18:15:06 -05:00
timothyteakettle
613880b9b0 saves and moths 2020-08-21 23:32:43 +01:00
timothyteakettle
29ce240903 yes 2020-08-21 23:17:40 +01:00
timothyteakettle
a75d91299a yep 2020-08-21 23:16:44 +01:00
Timothy Teakettle
b953622e6f FUCK 2020-08-21 22:14:50 +01:00
Timothy Teakettle
cbe9d05fb6 fuck 2020-08-21 21:08:17 +01:00
Detective Google
0fbd27fcfb reskin_obj is now a radial 2020-08-21 14:57:11 -05:00
Sonic121x
bfc5be9d8b fix tea 2020-08-22 03:32:42 +08:00
DeltaFire
bf799472d1 fixes the APC access check 2020-08-21 19:35:58 +02: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
raspyosu
95cb1faa37 remove redefinition of logistic function
oops! all redefines
2020-08-21 00:30:12 -04:00
raspyosu
2bd63023d1 fix it again
FIXITFIXITFIXITFIXITFIXITFIXITFIXIT

makes teg logistic (thanks to putnam for the function)
2020-08-21 00:19:46 -04:00
timothyteakettle
709ddb4e58 test 2020-08-21 03:48:30 +01:00
raspyosu
c1468923d8 nerf the teg
it had to be done, my child.
2020-08-20 21:32:52 -04:00
lolman360
bda2c740ba Merge branch 'master' into AnPrimAssistants 2020-08-21 11:08:13 +10:00
Ghom
cd10655985 fix 2 2020-08-20 23:02:13 +02:00
Timothy Teakettle
88fb9d277a fix lizard snouts (#13223) 2020-08-20 22:58:54 +02:00
Ghommie
921a963e59 fix 1 2020-08-20 20:26:29 +02:00
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Timothy Teakettle
bc16a8f1b2 fix lizard snouts 2020-08-20 16:39:07 +01:00
Hatterhat
02194633b5 initial commit - za hando 2020-08-20 09:14:30 -05:00
Ludox
d51af28f77 Bumps min-pop to 25
Ahahah 3 years that we can have 10 pop xenos :)
2020-08-20 14:39:04 +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