Commit Graph

70047 Commits

Author SHA1 Message Date
Nadyr
d8d0af1e83 powder that makes you say yes 2022-06-22 19:42:55 -04:00
Nadyr
d639f8f4b4 Merge pull request #4366 from CHOMPStation2/upstream-merge-13093
[MIRROR] Fixes being able to reach for the sky
2022-06-22 19:40:42 -04:00
Nadyr
03818cbf1f Merge pull request #4365 from CHOMPStation2/upstream-merge-13092
[MIRROR] Snailpilled update
2022-06-22 19:40:01 -04:00
Nadyr
569c939e6b Merge pull request #4364 from CHOMPStation2/upstream-merge-13074
[MIRROR] Adding myself to the CODEOWNERS for TGUI
2022-06-22 19:39:15 -04:00
Nadyr
f69b763b54 Merge pull request #4363 from CHOMPStation2/upstream-merge-13087
[MIRROR] [MIRROR] Adds fennec
2022-06-22 19:38:47 -04:00
Darlantan
65a66b6566 bundle that makes you say yes 2022-06-22 19:23:39 -04:00
Nadyr
27e5c0aa52 Merge pull request #4361 from CHOMPStation2/upstream-merge-13086
[MIRROR] [MIRROR] Tesh can into positronic
2022-06-22 19:22:31 -04:00
Casey
a3dd6b8ffa TGUI Input Framework 2022-06-22 19:19:55 -04:00
Nadyr
f03af38227 Merge pull request #4374 from CHOMPStation2/upstream-merge-13106
[MIRROR] Removes tgui-panel
2022-06-22 19:17:01 -04:00
Casey
5e8703a6b1 Removes tgui-panel 2022-06-22 18:48:54 -04:00
Nadyr
7fd7c8f138 Merge pull request #4373 from CHOMPStation2/upstream-merge-12700
[MIRROR] TGUI Additions
2022-06-22 18:43:48 -04:00
Darlantan
03a92a4a6f bundle that makes you say yes 2022-06-22 18:20:57 -04:00
Nadyr
f7edb1694e powder that makes you say yes 2022-06-22 18:20:29 -04:00
Nadyr
9951decbb1 Merge pull request #4358 from CHOMPStation2/upstream-merge-12259
[MIRROR] [MIRROR] Fixes tail layering over dresses/cloaks
2022-06-22 18:19:15 -04:00
Casey
16eff45dba TGUI Additions 2022-06-22 18:18:12 -04:00
Nadyr
5d7a2a1f4e Merge pull request #4359 from CHOMPStation2/upstream-merge-13046
[MIRROR] tgui-bench Port
2022-06-22 18:01:08 -04:00
Darlantan
5e40413a1d bundle that makes you say yes 2022-06-22 17:34:15 -04:00
Rykka
ed22cb07f2 Add missed CHOMPEdit 2022-06-22 15:19:53 -06:00
Nadyr
95f1d08c2f Merge pull request #4353 from TheGreatKitsune/patch-1
Girders now render above catwalks.
2022-06-22 17:04:16 -04:00
Casey
3d8594ff54 pAI QOL 2022-06-21 10:35:42 +00:00
TheGreatKitsune
6cf363873e Updated icons for catborg 2022-06-20 09:41:01 -05:00
Victor Zisthus
fdbe666bcf Right.
This should be it. Guess I edited more than I thought.
2022-06-19 18:47:29 -04:00
Victor Zisthus
8c6591b64c Revert "..."
This reverts commit fd55a0f8d4.
2022-06-19 18:33:32 -04:00
Victor Zisthus
b66850eab9 Revert "agony"
This reverts commit d06009ec90.
2022-06-19 18:33:27 -04:00
Victor Zisthus
00837bb013 Revert "suffering"
This reverts commit b49da85b30.
2022-06-19 18:33:23 -04:00
Victor Zisthus
a3ac111dd2 Revert "adsfgh"
This reverts commit 8acbd85772.
2022-06-19 18:33:19 -04:00
Victor Zisthus
8acbd85772 adsfgh 2022-06-19 18:29:26 -04:00
Victor Zisthus
b49da85b30 suffering 2022-06-19 18:26:38 -04:00
Victor Zisthus
d06009ec90 agony 2022-06-19 18:25:23 -04:00
Victor Zisthus
fd55a0f8d4 ...
How in the heck did those lines become 4 spaces instead of one tab?
2022-06-19 18:23:39 -04:00
Victor Zisthus
7e5cbb4efb Comments
This should be sent upstream.
2022-06-19 18:16:57 -04:00
Victor Zisthus
03bc532265 Robotics Brute Repair Surgery Fix
Added BASIC FEEDBACK in the form of a damage check for the surgery step so people stop attacking their patients on the operating table mid-surgery.
2022-06-19 18:14:17 -04:00
TheGreatKitsune
32cf3650ed Add catborg modules 2022-06-19 12:39:26 -05:00
Bib Bob
24d097132e Adds 'back ribbons' as sprites.
Meant for sylveon type characters, can also double as tentacles for those slime chars too. Colorable.
2022-06-19 12:33:38 -05:00
Casey
9ba4b8a665 New pAI verb 2022-06-19 12:44:43 +00:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
9da1ee0ba4 Adjust Mass and Hide fixes 2022-06-19 11:08:26 +00:00
Casey
928a321b5f TGUI Input Conversions 2022-06-19 03:59:14 +00:00
Casey
d4f8e75cd6 Adds Happy carpet 2022-06-19 03:59:10 +00:00
Casey
e84393199a TGUI Apostrophe Hotfix 2022-06-19 03:59:05 +00:00
CHOMPStation2
eff3c610e6 Makes security cyborg taser cost the same charge as security's tasers. 2022-06-19 01:00:38 +00:00
Casey
5fac79aa3c Merge pull request #13104 from foopwo/tasey
Makes security cyborg taser cost the same charge as security's tasers.
2022-06-19 01:00:38 +00:00
Casey
5dfbb6dd3d Fixes tail layering bugs 2022-06-19 01:00:34 +00:00
CHOMPStation2
9ad05c0379 Gives all voremobs 'nom from above' ability. 2022-06-19 01:00:29 +00:00
Casey
6d3b309f12 Merge pull request #13109 from Heroman3003/voremob-above
Gives all voremobs 'nom from above' ability.
2022-06-19 01:00:29 +00:00
CHOMPStation2
fcf722972f Fixes ambigous genders being too ambigous 2022-06-19 00:59:23 +00:00
Casey
727fd44c86 Merge pull request #13099 from Heroman3003/ambiguity
Fixes ambigous genders being too ambigous
2022-06-19 00:59:23 +00:00
CHOMPStation2
6cc2a6949c Fixes Absorbed Hold messages causing blank spaces to absorbed prey if you had none set 2022-06-19 00:59:17 +00:00
Casey
22fdc88844 Merge pull request #13100 from Heroman3003/absorbfix
Fixes Absorbed Hold messages causing blank spaces to absorbed prey if you had none set
2022-06-19 00:59:16 +00:00
Casey
54279fa4de [MIRROR] Adds Some More Decorative Flooring Types 2022-06-19 00:44:42 +00:00