Commit e8c09e2
More cybernetic organs and additional organ functions (yogstation13#13089)
* someone fucking broke tails again thanks guys
* adds "organ efficiency", a modifier for how strong an organ is in generic organ-related activities
gives higher organ efficiency to several upgraded cybernetic organs, alongside with the generic organ-related activities it does stuff with
adds ghetto craftable organs, currently just the lungs and heart, which have lower max health and organ efficiency
adds cybernetic stomachs and ears
redoes the sprite for the cybernetic heart and makes it actually beat
switches the nanite heart to use the nanite organ icon
* did not mean to remove that
* Update organ_internal.dm
* Update code/modules/surgery/organs/lungs.dm
Co-authored-by: Hopekz <hopekxx@gmail.com>
* Update code/modules/surgery/organs/heart.dm
Co-authored-by: Hopekz <hopekxx@gmail.com>
Co-authored-by: Hopekz <hopekxx@gmail.com>1 parent b846d40 commit e8c09e2Copy full SHA for e8c09e2
14 files changed
+163-33Lines changed: 163 additions & 33 deletions
File tree
Expand file treeCollapse file tree
Open diff view settings
Filter options
- code
- datums/components/crafting
- modules
- mob/living
- carbon
- research
- designs
- techweb
- surgery/organs
- icons/obj
- yogstation
- code/modules/surgery/organs
- icons/obj
Expand file treeCollapse file tree
Open diff view settings
Collapse file
code/datums/components/crafting/recipes.dm
Copy file name to clipboardExpand all lines: code/datums/components/crafting/recipes.dm+21-1Lines changed: 21 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
426 | 426 | |
427 | 427 | |
428 | 428 | |
| 429 | + |
| 430 | + |
| 431 | + |
| 432 | + |
| 433 | + |
| 434 | + |
| 435 | + |
| 436 | + |
| 437 | + |
| 438 | + |
| 439 | + |
| 440 | + |
| 441 | + |
| 442 | + |
| 443 | + |
| 444 | + |
| 445 | + |
| 446 | + |
| 447 | + |
| 448 | + |
429 | 449 | |
430 | 450 | |
431 | 451 | |
| ||
806 | 826 | |
807 | 827 | |
808 | 828 | |
809 | | - |
| 829 | + |
810 | 830 | |
811 | 831 | |
812 | 832 | |
|
Collapse file
code/modules/mob/living/blood.dm
Copy file name to clipboardExpand all lines: code/modules/mob/living/blood.dm+4-1Lines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
32 | 32 | |
33 | 33 | |
34 | 34 | |
| 35 | + |
| 36 | + |
35 | 37 | |
36 | 38 | |
37 | 39 | |
| ||
46 | 48 | |
47 | 49 | |
48 | 50 | |
| 51 | + |
49 | 52 | |
50 | | - |
| 53 | + |
51 | 54 | |
52 | 55 | |
53 | 56 | |
|
Collapse file
code/modules/mob/living/carbon/life.dm
Copy file name to clipboardExpand all lines: code/modules/mob/living/carbon/life.dm+3-7Lines changed: 3 additions & 7 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
54 | 54 | |
55 | 55 | |
56 | 56 | |
57 | | - |
58 | 57 | |
59 | | - |
60 | | - |
61 | | - |
62 | | - |
63 | | - |
| 58 | + |
| 59 | + |
64 | 60 | |
65 | 61 | |
66 | | - |
| 62 | + |
67 | 63 | |
68 | 64 | |
69 | 65 | |
|
Collapse file
code/modules/research/designs/medical_designs.dm
Copy file name to clipboardExpand all lines: code/modules/research/designs/medical_designs.dm+33Lines changed: 33 additions & 0 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
543 | 543 | |
544 | 544 | |
545 | 545 | |
| 546 | + |
| 547 | + |
| 548 | + |
| 549 | + |
| 550 | + |
| 551 | + |
| 552 | + |
| 553 | + |
| 554 | + |
| 555 | + |
| 556 | + |
| 557 | + |
| 558 | + |
| 559 | + |
| 560 | + |
| 561 | + |
| 562 | + |
| 563 | + |
| 564 | + |
| 565 | + |
| 566 | + |
| 567 | + |
| 568 | + |
| 569 | + |
| 570 | + |
| 571 | + |
| 572 | + |
| 573 | + |
| 574 | + |
| 575 | + |
| 576 | + |
| 577 | + |
| 578 | + |
546 | 579 | |
547 | 580 | |
548 | 581 | |
|
Collapse file
code/modules/research/techweb/all_nodes.dm
Copy file name to clipboardExpand all lines: code/modules/research/techweb/all_nodes.dm+2-2Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
521 | 521 | |
522 | 522 | |
523 | 523 | |
524 | | - |
| 524 | + |
525 | 525 | |
526 | 526 | |
527 | 527 | |
| ||
530 | 530 | |
531 | 531 | |
532 | 532 | |
533 | | - |
| 533 | + |
534 | 534 | |
535 | 535 | |
536 | 536 | |
|
Collapse file
code/modules/surgery/organs/ears.dm
Copy file name to clipboardExpand all lines: code/modules/surgery/organs/ears.dm+9-1Lines changed: 9 additions & 1 deletion
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
39 | 39 | |
40 | 40 | |
41 | 41 | |
42 | | - |
| 42 | + |
43 | 43 | |
44 | 44 | |
45 | 45 | |
| ||
110 | 110 | |
111 | 111 | |
112 | 112 | |
| 113 | + |
| 114 | + |
| 115 | + |
| 116 | + |
| 117 | + |
| 118 | + |
| 119 | + |
| 120 | + |
113 | 121 | |
114 | 122 | |
115 | 123 | |
|
Collapse file
code/modules/surgery/organs/heart.dm
Copy file name to clipboardExpand all lines: code/modules/surgery/organs/heart.dm+18-4Lines changed: 18 additions & 4 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
20 | 20 | |
21 | 21 | |
22 | 22 | |
| 23 | + |
| 24 | + |
| 25 | + |
| 26 | + |
| 27 | + |
23 | 28 | |
24 | 29 | |
25 | 30 | |
| ||
46 | 51 | |
47 | 52 | |
48 | 53 | |
49 | | - |
| 54 | + |
50 | 55 | |
51 | 56 | |
52 | 57 | |
53 | 58 | |
54 | | - |
| 59 | + |
55 | 60 | |
56 | 61 | |
57 | 62 | |
| ||
175 | 180 | |
176 | 181 | |
177 | 182 | |
| 183 | + |
| 184 | + |
| 185 | + |
| 186 | + |
| 187 | + |
| 188 | + |
| 189 | + |
| 190 | + |
178 | 191 | |
179 | 192 | |
180 | 193 | |
| ||
189 | 202 | |
190 | 203 | |
191 | 204 | |
192 | | - |
| 205 | + |
193 | 206 | |
| 207 | + |
194 | 208 | |
195 | 209 | |
196 | 210 | |
| ||
207 | 221 | |
208 | 222 | |
209 | 223 | |
210 | | - |
| 224 | + |
211 | 225 | |
212 | 226 | |
213 | 227 | |
|
Collapse file
code/modules/surgery/organs/lungs.dm
Copy file name to clipboardExpand all lines: code/modules/surgery/organs/lungs.dm+34-14Lines changed: 34 additions & 14 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
92 | 92 | |
93 | 93 | |
94 | 94 | |
| 95 | + |
95 | 96 | |
96 | 97 | |
97 | 98 | |
| ||
121 | 122 | |
122 | 123 | |
123 | 124 | |
124 | | - |
| 125 | + |
125 | 126 | |
126 | 127 | |
127 | 128 | |
| ||
149 | 150 | |
150 | 151 | |
151 | 152 | |
152 | | - |
| 153 | + |
153 | 154 | |
154 | 155 | |
155 | 156 | |
| ||
186 | 187 | |
187 | 188 | |
188 | 189 | |
189 | | - |
| 190 | + |
190 | 191 | |
191 | 192 | |
192 | 193 | |
| ||
216 | 217 | |
217 | 218 | |
218 | 219 | |
219 | | - |
| 220 | + |
220 | 221 | |
221 | 222 | |
222 | 223 | |
| ||
281 | 282 | |
282 | 283 | |
283 | 284 | |
284 | | - |
| 285 | + |
285 | 286 | |
286 | 287 | |
287 | 288 | |
| ||
299 | 300 | |
300 | 301 | |
301 | 302 | |
302 | | - |
| 303 | + |
303 | 304 | |
304 | 305 | |
305 | 306 | |
| ||
309 | 310 | |
310 | 311 | |
311 | 312 | |
312 | | - |
| 313 | + |
313 | 314 | |
314 | 315 | |
315 | 316 | |
| ||
350 | 351 | |
351 | 352 | |
352 | 353 | |
353 | | - |
| 354 | + |
354 | 355 | |
355 | 356 | |
356 | 357 | |
| ||
460 | 461 | |
461 | 462 | |
462 | 463 | |
| 464 | + |
| 465 | + |
| 466 | + |
| 467 | + |
| 468 | + |
| 469 | + |
| 470 | + |
| 471 | + |
| 472 | + |
| 473 | + |
| 474 | + |
| 475 | + |
463 | 476 | |
464 | 477 | |
465 | 478 | |
| ||
487 | 500 | |
488 | 501 | |
489 | 502 | |
490 | | - |
491 | | - |
492 | | - |
493 | | - |
494 | | - |
| 503 | + |
| 504 | + |
| 505 | + |
| 506 | + |
495 | 507 | |
496 | 508 | |
497 | 509 | |
| ||
505 | 517 | |
506 | 518 | |
507 | 519 | |
| 520 | + |
| 521 | + |
| 522 | + |
| 523 | + |
| 524 | + |
| 525 | + |
| 526 | + |
508 | 527 | |
509 | 528 | |
510 | 529 | |
| ||
521 | 540 | |
522 | 541 | |
523 | 542 | |
524 | | - |
| 543 | + |
525 | 544 | |
526 | 545 | |
| 546 | + |
527 | 547 | |
528 | 548 | |
529 | 549 | |
|
Collapse file
code/modules/surgery/organs/organ_internal.dm
Copy file name to clipboardExpand all lines: code/modules/surgery/organs/organ_internal.dm+8-2Lines changed: 8 additions & 2 deletions
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| ||
10 | 10 | |
11 | 11 | |
12 | 12 | |
13 | | - |
| 13 | + |
| 14 | + |
| 15 | + |
| 16 | + |
14 | 17 | |
15 | 18 | |
16 | 19 | |
| ||
102 | 105 | |
103 | 106 | |
104 | 107 | |
105 | | - |
106 | 108 | |
107 | 109 | |
108 | 110 | |
| ||
191 | 193 | |
192 | 194 | |
193 | 195 | |
| 196 | + |
| 197 | + |
| 198 | + |
| 199 | + |
194 | 200 | |
195 | 201 | |
196 | 202 | |
|
0 commit comments