Skip to content

Commit bb43f9f

Browse files
notghostinotghosti
committed
Pass 1 of renaming disease/advanced
1 parent ba6f719 commit bb43f9f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+151
-151
lines changed

‎code/datums/components/cleaner.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
if(isitem(target))
129129
var/obj/item/item= target
130130
if(length(item.viruses))
131-
for(var/datum/disease/advanced/D as anything in item.viruses)
131+
for(var/datum/disease/acute/D as anything in item.viruses)
132132
item.remove_disease(D)
133133

134134
on_cleaned_callback?.Invoke(source, target, user, clean_succeeded)

‎code/datums/components/infective.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,5 +130,5 @@
130130
var/block = living.check_contact_sterility(BODY_ZONE_EVERYTHING)
131131
var/list/contact = filter_disease_by_spread(diseases, required = DISEASE_SPREAD_CONTACT_SKIN)
132132
if(length(contact) && !block)
133-
for(var/datum/disease/advanced/V as anything in contact)
133+
for(var/datum/disease/acute/V as anything in contact)
134134
living.try_contact_infect(V, note="(Skin Contact - (Infective Component), coming from [src.parent])")

‎code/datums/components/rot.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
return
153153

154154
//We're running just under the "worst disease", since we don't want these to be too strong
155-
var/virus_choice = pick(subtypesof(/datum/disease/advanced)- typesof(/datum/disease/advanced/premade))
155+
var/virus_choice = pick(subtypesof(/datum/disease/acute)- typesof(/datum/disease/acute/premade))
156156
var/list/anti = list(
157157
ANTIGEN_BLOOD = 2,
158158
ANTIGEN_COMMON = 2,
@@ -167,7 +167,7 @@
167167
EFFECT_DANGER_HARMFUL = 0,
168168
EFFECT_DANGER_DEADLY = 0,
169169
)
170-
var/datum/disease/advanced/disease = new virus_choice
170+
var/datum/disease/acute/disease = new virus_choice
171171
disease.makerandom(list(20,50),list(30,50),anti,bad,src)
172172

173173
var/note = "Rot Infection Contact [key_name(react_to)]"

‎code/datums/wounds/slash.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
/datum/wound/slash/flesh/proc/lick_wounds(mob/living/carbon/human/user)
216216
// transmission is one way patient -> felinid since google said cat saliva is antiseptic or whatever, and also because felinids are already risking getting beaten for this even without people suspecting they're spreading a deathvirus
217217
for(var/i in victim.diseases)
218-
var/datum/disease/advanced/iter_disease = i
218+
var/datum/disease/acute/iter_disease = i
219219
if(iter_disease.spread_flags & (DISEASE_SPREAD_SPECIAL | DISEASE_SPREAD_NON_CONTAGIOUS))
220220
continue
221221
user.infect_disease(iter_disease, notes = "Spread via Licking (Blood)")

‎code/game/objects/items/devices/scanners/health_analyzer.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -758,8 +758,8 @@
758758

759759
var/list/render = list()
760760
for(var/datum/disease/disease as anything in patient.diseases)
761-
if(istype(disease, /datum/disease/advanced))
762-
var/datum/disease/advanced/advanced = disease
761+
if(istype(disease, /datum/disease/acute))
762+
var/datum/disease/acute/advanced = disease
763763
if(!(disease.visibility_flags & HIDDEN_SCANNER))
764764
render += "<span class='alert ml-1'><b>Warning: [advanced.origin] disease detected</b>\n\
765765
<div class='ml-2'>Name: [advanced.real_name()].\nType: [disease.get_spread_string()].\nStage: [disease.stage]/[disease.max_stages].</div>\

‎code/game/objects/items/dice.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@
382382
if(9)
383383
//Cold
384384
selected_turf.visible_message(span_userdanger("[user] looks a little under the weather!"))
385-
var/virus_choice = pick(subtypesof(/datum/disease/advanced)- typesof(/datum/disease/advanced/premade))
385+
var/virus_choice = pick(subtypesof(/datum/disease/acute)- typesof(/datum/disease/acute/premade))
386386
var/list/anti = list(
387387
ANTIGEN_BLOOD = 1,
388388
ANTIGEN_COMMON = 1,
@@ -397,7 +397,7 @@
397397
EFFECT_DANGER_HARMFUL = 1,
398398
EFFECT_DANGER_DEADLY = 0,
399399
)
400-
var/datum/disease/advanced/new_disease = new virus_choice
400+
var/datum/disease/acute/new_disease = new virus_choice
401401
new_disease.makerandom(list(50,90),list(50,100),anti,bad,src)
402402
user.infect_disease(new_disease, TRUE, "(Die of Fate 7)")
403403

‎code/game/objects/items/food/snacks.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
/obj/item/food/candy/bronx/proc/after_eat(mob/living/eater)
4444
if(ishuman(eater))
45-
var/datum/disease/advanced/parasite/disease = new
45+
var/datum/disease/acute/parasite/disease = new
4646
var/list/anti = list(
4747
ANTIGEN_BLOOD = 1,
4848
ANTIGEN_COMMON = 1,

‎code/game/objects/structures/shower.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
248248
if(isitem(target))
249249
var/obj/item/item = target
250250
if(length(item.viruses))
251-
for(var/datum/disease/advanced/D as anything in item.viruses)
251+
for(var/datum/disease/acute/D as anything in item.viruses)
252252
item.remove_disease(D)
253253
if(isliving(target))
254254
var/mob/living/living_target = target

‎code/modules/admin/verbs/secrets.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ GLOBAL_DATUM(everyone_an_antag, /datum/everyone_is_an_antag_controller)
102102
continue
103103
if(!length(living.diseases))
104104
continue
105-
for(var/datum/disease/advanced/disease as anything in living.diseases)
105+
for(var/datum/disease/acute/disease as anything in living.diseases)
106106
disease.cure(target = living)
107107

108108
if("list_bombers")

‎code/modules/antagonists/abductor/equipment/glands/viral.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
EFFECT_DANGER_HARMFUL = 0,
2525
EFFECT_DANGER_DEADLY = 0,
2626
)
27-
var/virus_choice = pick(subtypesof(/datum/disease/advanced)- typesof(/datum/disease/advanced/premade))
28-
var/datum/disease/advanced/D = new virus_choice
27+
var/virus_choice = pick(subtypesof(/datum/disease/acute)- typesof(/datum/disease/acute/premade))
28+
var/datum/disease/acute/D = new virus_choice
2929

3030
D.makerandom(list(30,55),list(0,50),anti,bad,null)
3131

‎code/modules/events/disease_outbreak.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
afflicted += disease_event.disease_candidates
110110
disease_event.disease_candidates.Cut() //Clean the list after use
111111

112-
var/virus_choice = pick(subtypesof(/datum/disease/advanced)- typesof(/datum/disease/advanced/premade))
112+
var/virus_choice = pick(subtypesof(/datum/disease/acute)- typesof(/datum/disease/acute/premade))
113113
var/list/anti = list(
114114
ANTIGEN_BLOOD = 1,
115115
ANTIGEN_COMMON = 1,
@@ -124,7 +124,7 @@
124124
EFFECT_DANGER_HARMFUL = 0,
125125
EFFECT_DANGER_DEADLY = 0,
126126
)
127-
var/datum/disease/advanced/new_disease = new virus_choice
127+
var/datum/disease/acute/new_disease = new virus_choice
128128
new_disease.makerandom(list(30,60),list(50,100),anti,bad,src)
129129
new_disease.carrier = TRUE
130130
illness_type = new_disease.name
@@ -218,7 +218,7 @@
218218
afflicted += disease_event.disease_candidates
219219
disease_event.disease_candidates.Cut()
220220

221-
var/virus_choice = pick(subtypesof(/datum/disease/advanced)- typesof(/datum/disease/advanced/premade))
221+
var/virus_choice = pick(subtypesof(/datum/disease/acute)- typesof(/datum/disease/acute/premade))
222222
var/list/anti = list(
223223
ANTIGEN_BLOOD = 1,
224224
ANTIGEN_COMMON = 1,
@@ -233,7 +233,7 @@
233233
EFFECT_DANGER_HARMFUL = 3,
234234
EFFECT_DANGER_DEADLY = 1,
235235
)
236-
var/datum/disease/advanced/new_disease = new virus_choice
236+
var/datum/disease/acute/new_disease = new virus_choice
237237
new_disease.makerandom(list(50,90),list(50,100),anti,bad,src)
238238
new_disease.carrier = TRUE
239239
illness_type = new_disease.name

‎code/modules/jobs/job_types/_job.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
spawned_human.mind.adjust_experience(i, roundstart_experience[i], TRUE)
175175

176176
if(prob(25))
177-
var/virus_choice = pick(subtypesof(/datum/disease/advanced)- typesof(/datum/disease/advanced/premade))
177+
var/virus_choice = pick(subtypesof(/datum/disease/acute)- typesof(/datum/disease/acute/premade))
178178
var/list/anti = list(
179179
ANTIGEN_BLOOD = 2,
180180
ANTIGEN_COMMON = 2,
@@ -189,7 +189,7 @@
189189
EFFECT_DANGER_HARMFUL = 2,
190190
EFFECT_DANGER_DEADLY = 2,
191191
)
192-
var/datum/disease/advanced/disease = new virus_choice
192+
var/datum/disease/acute/disease = new virus_choice
193193
disease.makerandom(list(50,90),list(10,100),anti,bad,src)
194194

195195
disease.disease_flags |= DISEASE_DORMANT

‎code/modules/mob/living/carbon/carbon_defense.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
var/block = living.check_contact_sterility(BODY_ZONE_EVERYTHING)
196196
var/list/contact = filter_disease_by_spread(diseases, required = DISEASE_SPREAD_CONTACT_SKIN)
197197
if(length(contact) && !block)
198-
for(var/datum/disease/advanced/V as anything in contact)
198+
for(var/datum/disease/acute/V as anything in contact)
199199
living.infect_disease(V, notes="(Skin Contact - (Bump), coming from [src])")
200200

201201
if(isliving(user))
@@ -204,7 +204,7 @@
204204
if(length(living.diseases))
205205
var/list/contact = filter_disease_by_spread(living.diseases, required = DISEASE_SPREAD_CONTACT_SKIN)
206206
if(length(contact) && !block)
207-
for(var/datum/disease/advanced/V as anything in contact)
207+
for(var/datum/disease/acute/V as anything in contact)
208208
infect_disease(V, notes="(Skin Contact - (Bump), coming from [living])")
209209

210210

‎code/modules/mob/living/living.dm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
var/block = living.check_contact_sterility(BODY_ZONE_EVERYTHING)
104104
var/list/contact = filter_disease_by_spread(diseases, required = DISEASE_SPREAD_CONTACT_SKIN)
105105
if(length(contact) && !block)
106-
for(var/datum/disease/advanced/V as anything in contact)
106+
for(var/datum/disease/acute/V as anything in contact)
107107
living.infect_disease(V, notes="(Skin Contact - (Bump), coming from [src])")
108108

109109
if(isliving(M))
@@ -112,7 +112,7 @@
112112
if(length(living.diseases))
113113
var/list/contact = filter_disease_by_spread(living.diseases, required = DISEASE_SPREAD_CONTACT_SKIN)
114114
if(length(contact) && !block)
115-
for(var/datum/disease/advanced/V as anything in contact)
115+
for(var/datum/disease/acute/V as anything in contact)
116116
infect_disease(V, notes="(Skin Contact - (Bump), coming from [living])")
117117

118118
SEND_SIGNAL(src, COMSIG_LIVING_MOB_BUMP, M)
@@ -399,7 +399,7 @@
399399
var/block = living.check_contact_sterility(BODY_ZONE_EVERYTHING)
400400
var/list/contact = filter_disease_by_spread(diseases, required = DISEASE_SPREAD_CONTACT_SKIN)
401401
if(length(contact) && !block)
402-
for(var/datum/disease/advanced/V as anything in contact)
402+
for(var/datum/disease/acute/V as anything in contact)
403403
living.infect_disease(V, notes="(Skin Contact - (Grab), coming from [src])")
404404

405405
if(isliving(M))
@@ -408,7 +408,7 @@
408408
if(length(living.diseases))
409409
var/list/contact = filter_disease_by_spread(living.diseases, required = DISEASE_SPREAD_CONTACT_SKIN)
410410
if(length(contact) && !block)
411-
for(var/datum/disease/advanced/V as anything in contact)
411+
for(var/datum/disease/acute/V as anything in contact)
412412
infect_disease(V, notes="(Skin Contact - (Grab), coming from [living])")
413413

414414
if(iscarbon(L))

‎code/modules/reagents/chemistry/reagents/other_reagents.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
/datum/reagent/blood/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume, show_message=TRUE, touch_protection=0)
4343
. = ..()
4444
for(var/datum/disease/strain as anything in data?["viruses"])
45-
if(istype(strain, /datum/disease/advanced))
46-
var/datum/disease/advanced/advanced = strain
45+
if(istype(strain, /datum/disease/acute))
46+
var/datum/disease/acute/advanced = strain
4747
if(methods & (INJECT|INGEST|PATCH))
4848
exposed_mob.infect_disease(advanced, TRUE, "(Contact, splashed with infected blood)")
4949
if((methods & (TOUCH | VAPOR)) && (advanced.spread_flags & DISEASE_SPREAD_BLOOD))

‎monkestation/code/modules/can_spessmen_feel_pain/pain/shock.dm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// -- Shock from too much pain. --
2-
/datum/disease/advanced/premade/shock
2+
/datum/disease/acute/premade/shock
33
form = "Condition"
44
name = "Shock"
55
spread_text = "Neurogenic" // Only model pain shock
@@ -22,7 +22,7 @@
2222
/// How many conditions do we need to not get a heart attack?
2323
var/conditions_required_to_maintain = 3
2424

25-
/datum/disease/advanced/premade/shock/after_add()
25+
/datum/disease/acute/premade/shock/after_add()
2626
affected_mob.apply_status_effect(/datum/status_effect/low_blood_pressure)
2727
affected_mob.set_pain_mod(type, 1.2)
2828
antigen = null
@@ -32,7 +32,7 @@
3232
*
3333
* returns the total number of conditions we fulfill.
3434
*/
35-
/datum/disease/advanced/premade/shock/proc/check_cure_conditions()
35+
/datum/disease/acute/premade/shock/proc/check_cure_conditions()
3636
if(!ishuman(affected_mob))
3737
return TRUE
3838
var/mob/living/carbon/human = affected_mob
@@ -85,12 +85,12 @@
8585

8686
return conditions_fulfilled
8787

88-
/datum/disease/advanced/premade/shock/cure(add_resistance, mob/living/carbon/target)
88+
/datum/disease/acute/premade/shock/cure(add_resistance, mob/living/carbon/target)
8989
affected_mob.remove_status_effect(/datum/status_effect/low_blood_pressure)
9090
affected_mob.unset_pain_mod(type)
9191
return ..()
9292

93-
/datum/disease/advanced/premade/shock/activate(seconds_per_tick, times_fired)
93+
/datum/disease/acute/premade/shock/activate(seconds_per_tick, times_fired)
9494
. = ..()
9595
if(!ishuman(affected_mob))
9696
return

‎monkestation/code/modules/virology/__effects.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
mouse_opacity = 1
88
layer = OBJ_LAYER
99
var/last_openner
10-
var/datum/disease/advanced/contained_virus
10+
var/datum/disease/acute/contained_virus
1111

1212
/obj/effect/decal/cleanable/virusdish/Entered(mob/living/perp)
1313
..()
@@ -24,7 +24,7 @@
2424
block = perp.check_contact_sterility(BODY_ZONE_LEGS)
2525
bleeding = perp.check_bodypart_bleeding(BODY_ZONE_LEGS)
2626

27-
27+
2828
if (!block && contained_virus.spread_flags & DISEASE_SPREAD_CONTACT_SKIN)
2929
perp.infect_disease(contained_virus, notes="(Contact, from [(perp.body_position & LYING_DOWN)?"lying":"standing"] over a broken virus dish[last_openner ? " broken by [last_openner]" : ""])")
3030
else if (bleeding && (contained_virus.spread_flags & DISEASE_SPREAD_BLOOD))

‎monkestation/code/modules/virology/disease/base_disease_folder/_base.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ GLOBAL_LIST_INIT(virusDB, list())
100100

101101
return list(lowest_stage,highest_concentration)
102102

103-
/datum/disease/advanced/cure(add_resistance = TRUE, mob/living/carbon/target)
103+
/datum/disease/acute/cure(add_resistance = TRUE, mob/living/carbon/target)
104104
target = target || affected_mob || usr
105105
if(!istype(affected_mob) || QDELING(affected_mob))
106106
return
@@ -188,7 +188,7 @@ GLOBAL_LIST_INIT(virusDB, list())
188188
ticks = 0
189189

190190
//Pathogen killing each others
191-
for (var/datum/disease/advanced/enemy_pathogen as anything in mob.diseases)
191+
for (var/datum/disease/acute/enemy_pathogen as anything in mob.diseases)
192192
if(enemy_pathogen == src)
193193
continue
194194

‎monkestation/code/modules/virology/disease/base_disease_folder/admin.dm

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
if(!istype(C) || !C.holder)
33
return 0
44

5-
var/datum/disease/advanced/D = new /datum/disease/advanced()
5+
var/datum/disease/acute/D = new /datum/disease/acute()
66
D.origin = "Badmin"
77

88
var/list/known_forms = list()
9-
for (var/disease_type in subtypesof(/datum/disease/advanced))
10-
var/datum/disease/advanced/d_type = disease_type
9+
for (var/disease_type in subtypesof(/datum/disease/acute))
10+
var/datum/disease/acute/d_type = disease_type
1111
known_forms[initial(d_type.form)] = d_type
1212

1313
known_forms += "custom"
@@ -24,13 +24,13 @@
2424

2525
if (chosen_form == "infect with an already existing pathogen")
2626
var/list/existing_pathogen = list()
27-
for(var/datum/disease/advanced/dis as anything in GLOB.inspectable_diseases)
27+
for(var/datum/disease/acute/dis as anything in GLOB.inspectable_diseases)
2828
existing_pathogen += dis
2929
var/chosen_pathogen = input(C, "Choose a pathogen", "Choose a pathogen") as null | anything in existing_pathogen
3030
if (!chosen_pathogen)
3131
qdel(D)
3232
return
33-
var/datum/disease/advanced/dis = chosen_pathogen
33+
var/datum/disease/acute/dis = chosen_pathogen
3434
D = dis.Copy()
3535
D.origin = "[D.origin] (Badmin)"
3636
else
@@ -52,7 +52,7 @@
5252
//D.can_kill = something something a while loop but probably not worth the effort. If you need it for your bus code it yourself.
5353
else
5454
var/d_type = known_forms[chosen_form]
55-
var/datum/disease/advanced/d_inst = new d_type
55+
var/datum/disease/acute/d_inst = new d_type
5656
D.form = chosen_form
5757
D.max_stages = d_inst.max_stages
5858
D.infectionchance = d_inst.infectionchance
@@ -229,7 +229,7 @@
229229
var/infctd_items = 0
230230
var/dishes = 0
231231
for (var/mob/living/L in GLOB.mob_list)
232-
for(var/datum/disease/advanced/D as anything in L.diseases)
232+
for(var/datum/disease/acute/D as anything in L.diseases)
233233
if (ID == "[D.uniqueID]-[D.subID]")
234234
infctd_mobs++
235235
if (L.stat == DEAD)
@@ -240,7 +240,7 @@
240240
logs["[ID]"]["[L]"] = D.log
241241

242242
for (var/obj/item/I in GLOB.infected_items)
243-
for(var/datum/disease/advanced/D as anything in I.viruses)
243+
for(var/datum/disease/acute/D as anything in I.viruses)
244244
if (ID == "[D.uniqueID]-[D.subID]")
245245
infctd_items++
246246
if(!length(logs["[ID]"]))
@@ -256,7 +256,7 @@
256256
logs["[ID]"] += "[dish]"
257257
logs["[ID]"]["[dish]"] = dish.contained_virus.log
258258

259-
var/datum/disease/advanced/D = GLOB.inspectable_diseases[ID]
259+
var/datum/disease/acute/D = GLOB.inspectable_diseases[ID]
260260
dat += {"<tr>
261261
<td><a href='?_src_=holder;[HrefToken(forceGlobal = TRUE)];diseasepanel_examine=["[D.uniqueID]"]-["[D.subID]"]'>[D.form] #["[D.uniqueID]"]-["[D.subID]"]</a></td>
262262
<td>[D.origin]</td>

0 commit comments

Comments
 (0)