Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes double null rod, and generally cleans up and reblanaces some pathology stuff #743

Merged
merged 15 commits into from
Dec 30, 2023
4 changes: 3 additions & 1 deletion code/modules/antagonists/changeling/powers/panacea.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,18 @@
user.reagents.add_reagent(/datum/reagent/medicine/pen_acid, 20)
user.reagents.add_reagent(/datum/reagent/medicine/antihol, 10)
user.reagents.add_reagent(/datum/reagent/medicine/mannitol, 25)
user.reagents.add_reagent(/datum/reagent/medicine/antipathogenic/changeling, 5) //MONKESTATION ADDITION

if(iscarbon(user))
var/mob/living/carbon/C = user
C.cure_all_traumas(TRAUMA_RESILIENCE_LOBOTOMY)

if(isliving(user))
/*if(isliving(user)) //MONKESTATION REMOVAL: Virology rework
var/mob/living/L = user
for(var/thing in L.diseases)
var/datum/disease/D = thing
if(D.severity == DISEASE_SEVERITY_POSITIVE)
continue
D.cure()
*/
return TRUE
2 changes: 2 additions & 0 deletions monkestation/code/game/objects/items/implants/hardlight.dm
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,8 @@
embed_falloff_tile = 0
speed = 0.4 //lower = faster
shrapnel_type = /obj/item/shrapnel/bullet/spear
light_outer_range = 1
light_power = 1
hitsound = 'sound/weapons/bladeslice.ogg'
hitsound_wall = 'sound/weapons/parry.ogg'
embedding = list(embed_chance=100, fall_chance=2, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.5, pain_mult=5, jostle_pain_mult=6, rip_time=10)
Expand Down
6 changes: 1 addition & 5 deletions monkestation/code/modules/cryopods/trackers/cryo_chaplain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@

// if the mob is not a high priest, add to successors list
if(spawned_chaplain.mind.holy_role != HOLY_ROLE_HIGHPRIEST)
if(isnull(GLOB.holy_successors))
if(isnull(GLOB.holy_successors))
GLOB.holy_successors = list()
GLOB.holy_successors |= WEAKREF(spawned_chaplain)
return

// if the mob joins as a high priest (and there has been a previous high priest before them), make sure they get their own nullrod.
if(isnull(GLOB.current_highpriest))
spawned_chaplain.put_in_hands(new /obj/item/nullrod(spawned_chaplain))

// keep a record of the current high priest
GLOB.current_highpriest = WEAKREF(spawned_chaplain)

Expand Down
1 change: 1 addition & 0 deletions monkestation/code/modules/store/store_items/suits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ GLOBAL_LIST_INIT(store_suits, generate_store_items(/datum/store_item/suit))
name = "Carp Costume"
item_path = /obj/item/clothing/suit/hooded/carp_costume


/datum/store_item/suit/wizard
name = "Wizard Robe"
item_path = /obj/item/clothing/suit/wizrobe/fake
Expand Down
2 changes: 1 addition & 1 deletion monkestation/code/modules/virology/disease/_disease.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GLOBAL_LIST_INIT(virusDB, list())
//the percentage of the strength at which effects will start getting disabled by antibodies.
var/robustness = 100
//chance to cure the disease at every proc when the body is getting cooked alive.
var/max_bodytemperature = 1000
var/max_bodytemperature = T0C+100
//very low temperatures will stop the disease from activating/progressing
var/min_bodytemperature = 120
///split category used for predefined diseases atm
Expand Down
11 changes: 6 additions & 5 deletions monkestation/code/modules/virology/disease/symtoms/stage1.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
var/mob/living/carbon/human/host = mob
if (prob(50) && isturf(mob.loc))
if(istype(host.wear_mask, /obj/item/clothing/mask/cigarette))
var/obj/item/clothing/mask/cigarette/I = host.get_item_by_slot(ITEM_SLOT_MASK)
var/obj/item/clothing/mask/cigarette/ciggie = host.get_item_by_slot(ITEM_SLOT_MASK)
if(prob(20))
var/turf/Q = get_turf(mob)
var/turf/startLocation = get_turf(mob)
var/turf/endLocation
var/spitForce = pick(0,1,2,3)
endLocation = get_ranged_target_turf(Q, mob.dir, spitForce)
endLocation = get_ranged_target_turf(startLocation, mob.dir, spitForce)
to_chat(mob, "<span class ='warning'>You sneezed \the [host.wear_mask] out of your mouth!</span>")
host.dropItemToGround(I)
I.throw_at(endLocation,spitForce,1)
host.dropItemToGround(ciggie)
ciggie.throw_at(endLocation,spitForce,1)

/datum/symptom/gunck
name = "Flemmingtons"
Expand Down Expand Up @@ -85,6 +85,7 @@

/datum/symptom/eyewater/activate(mob/living/mob)
to_chat(mob, span_warning("Your eyes sting and water!"))
mob.emote("cry")


/datum/symptom/wheeze
Expand Down
Loading
Loading