File tree Expand file tree Collapse file tree 6 files changed +18
-1
lines changed
game/objects/items/storage
antagonists/monster_hunters/tools Expand file tree Collapse file tree 6 files changed +18
-1
lines changed Original file line number Diff line number Diff line change @@ -926,6 +926,8 @@ GLOBAL_LIST_INIT(layers_to_offset, list(
926
926
#define HEAL_CC_STATUS (1 << 18 )
927
927
// / Deletes any restraints on the mob (handcuffs / legcuffs)
928
928
#define HEAL_RESTRAINTS (1 << 19 )
929
+ // / Heals any postive diseases
930
+ #define HEAL_POSTIVE_DISEASES (1 << 20 )
929
931
930
932
// / Combination flag to only heal the main damage types.
931
933
#define HEAL_DAMAGE (HEAL_BRUTE | HEAL_BURN | HEAL_TOX | HEAL_OXY | HEAL_CLONE | HEAL_STAM )
Original file line number Diff line number Diff line change 439
439
440
440
/ obj / item/ storage/ box/ syndie_kit/ chemical/ Initialize(mapload)
441
441
. = .. ()
442
- atom_storage. max_slots = 14
442
+ atom_storage. max_slots = 15
443
443
444
444
/ obj / item/ storage/ box/ syndie_kit/ chemical/ PopulateContents()
445
445
new / obj / item/ reagent_containers/ cup/ bottle/ polonium(src )
455
455
new / obj / item/ reagent_containers/ cup/ bottle/ coniine(src )
456
456
new / obj / item/ reagent_containers/ cup/ bottle/ curare(src )
457
457
new / obj / item/ reagent_containers/ cup/ bottle/ amanitin(src )
458
+ new / obj / item/ reagent_containers/ cup/ bottle/ antipathogenic_changeling(src )
458
459
new / obj / item/ reagent_containers/ syringe(src )
459
460
460
461
/ obj / item/ storage/ box/ syndie_kit/ nuke
Original file line number Diff line number Diff line change 77
77
/ datum / status_effect/ cursed_blood/ on_apply()
78
78
to_chat (owner, span_warning(" You feel a great power surging through you!" ))
79
79
owner. add_movespeed_modifier(/ datum / movespeed_modifier/ cursed_blood)
80
+ owner. fully_heal(HEAL_NEGATIVE_DISEASES )
80
81
return TRUE
81
82
82
83
/ datum / status_effect/ cursed_blood/ on_remove()
Original file line number Diff line number Diff line change 939
939
if (disease. severity != DISEASE_SEVERITY_POSITIVE )
940
940
disease. cure(FALSE )
941
941
942
+ if (heal_flags & HEAL_POSTIVE_DISEASES )
943
+ for (var /datum /disease/disease as anything in diseases)
944
+ if (disease. severity == DISEASE_SEVERITY_POSITIVE )
945
+ disease. cure(FALSE )
946
+
942
947
if (heal_flags & HEAL_WOUNDS )
943
948
for (var /datum /wound/wound as anything in all_wounds)
944
949
wound. remove_wound()
Original file line number Diff line number Diff line change 2832
2832
drinker. adjustBruteLoss(- 2 * REM * seconds_per_tick, FALSE )
2833
2833
drinker. adjustFireLoss(- 2 * REM * seconds_per_tick, FALSE )
2834
2834
drinker. cause_pain(BODY_ZONES_ALL , - 5 * REM * seconds_per_tick) // MONKESTATION ADDITION
2835
+ drinker. fully_heal(HEAL_NEGATIVE_DISEASES )
2835
2836
if (drinker. blood_volume < BLOOD_VOLUME_NORMAL )
2836
2837
drinker. blood_volume += 3 * REM * seconds_per_tick
2837
2838
else
2840
2841
drinker. adjustFireLoss(2 * REM * seconds_per_tick, FALSE )
2841
2842
drinker. adjustOxyLoss(2 * REM * seconds_per_tick, FALSE )
2842
2843
drinker. adjustBruteLoss(2 * REM * seconds_per_tick, FALSE )
2844
+ drinker. fully_heal(HEAL_POSTIVE_DISEASES )
2843
2845
.. ()
2844
2846
return TRUE
2845
2847
Original file line number Diff line number Diff line change 527
527
name = " bottle of laugh syrup"
528
528
desc = " A pump bottle containing laugh syrup. The product of juicing Laughin' Peas. Fizzy, and seems to change flavour based on what it's used with!"
529
529
list_reagents = list (/ datum / reagent/ consumable/ laughsyrup = 50 )
530
+
531
+ // Changeling stuff
532
+ / obj / item/ reagent_containers/ cup/ bottle/ antipathogenic_changeling
533
+ name = " Changeling Immunoglobulin bottle"
534
+ desc = " A small bottle. Contains Changeling Immunoglobulin."
535
+ list_reagents = list (/ datum / reagent/ medicine/ antipathogenic/ changeling = 30 )
You can’t perform that action at this time.
0 commit comments