Skip to content

Commit 6d74a81

Browse files
authored
. (#2558)
* moves disease code into subfiles for easier management * redoes incubation adds dormant diseases * Update _stage_mutations.dm * changes * whoops * Update _job.dm * guh * Update loadout.dm * meh * woah * adds restricted tb symptom * Update _disease.dm * adds stage carry changes disease type to basic * double fix * Update spread_disease.dm * improvements * exotic blood works for diseases * start of cracker * new thing * fixes * more stuff * adds all the healing symptoms I forgot to before * adds skeleton of new antag * admin retirement home * Update CentCom.dmm * Revert "admin retirement home" This reverts commit 42588d3. * new store and loadout ui * reflexive and bluespace varients * fixes store items sometimes removing coins and not being added by refunding coins properly * replaces reflexive with carbon_take_brute * new splicer icon * new analyzer icon * Update splicer.dm * the incubator sprites * extrapolator sprite * new medical holobarriers * re-adds shuttle votes at 90 minutes * makes ghost roles run after 85 minutes regardless * Update _symptom.dm * recursive * floor health scanners * Update floor_health_scanner.dm * Update extrapolator.dm * Update others.dm * more stuff * new patches * start of it working * good changes * Update tgstation.dme * new things * fixes * new viro on meta * Update MetaStation.dmm * removes patch test as it behaves differently to other exposures now * Update symptom_component.dm * fixes pirates * Update nuclear_operative_ghost.dm * Update science_goggles.dm * Update MetaStation.dmm * adds the event * Update team.dm * Update team.dm * Update cult_comms.dm * makes it call start_poll_cultist_for_leader instead of poll for leader to prevent cult_vote_called from being false * removes toggling from goggles
1 parent eb7cd04 commit 6d74a81

File tree

105 files changed

+4607
-3332
lines changed

Some content is hidden

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

105 files changed

+4607
-3332
lines changed

_maps/map_files/MetaStation/MetaStation.dmm

Lines changed: 912 additions & 760 deletions
Large diffs are not rendered by default.

code/__DEFINES/diseases.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,5 @@
3434
#define DISEASE_SEVERITY_DANGEROUS "Dangerous"
3535
/// Diseases that can quickly kill an unprepared victim (fungal tb, gbs)
3636
#define DISEASE_SEVERITY_BIOHAZARD "BIOHAZARD"
37+
38+
#define DISEASE_HOLOSIGN_BLOCK 6

code/__DEFINES/role_preferences.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#define ROLE_SPIDER "Spider"
4141
#define ROLE_WIZARD_MIDROUND "Wizard (Midround)"
4242
// monke midrounds
43+
#define ROLE_PLAGUERAT "Plague Rat"
4344
#define ROLE_CORTICAL_BORER "Cortical Borer"
4445
#define ROLE_DRIFTING_CONTRACTOR "Drifting Contractor"
4546
#define ROLE_FLORIDA_MAN "Florida Man"
@@ -153,6 +154,7 @@ GLOBAL_LIST_INIT(special_roles, list(
153154
ROLE_SPIDER = 0,
154155
ROLE_WIZARD_MIDROUND = 14,
155156
//monkestation edit start
157+
ROLE_PLAGUERAT = 0,
156158
ROLE_CORTICAL_BORER = 0, // Module ID: CORTICAL_BORERS
157159
ROLE_DRIFTING_CONTRACTOR = 0,
158160
ROLE_VAMPIRICACCIDENT = 0,

code/__DEFINES/~monkestation/virology.dm

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,16 @@
4747
#define DISEASE_TRAUMA "trauma"
4848
#define DISEASE_DECLONING "decloning"
4949
#define DISEASE_ANXIETY "anxiety"
50+
51+
#define DISEASE_DORMANT (1 << 3)
52+
#define DISEASE_COPYSTAGE (1<<4)
53+
#define DISEASE_ANALYZED (1<<5)
54+
55+
#define COMSIG_CRACKER_PUZZLE_FAILURE "cracker_puzzle_failure"
56+
#define COMSIG_CRACKER_PUZZLE_SUCCESS "cracker_puzzle_success"
57+
58+
#define COMSIG_SYMPTOM_ATTACH "symptom_attach"
59+
#define COMSIG_SYMPTOM_DETACH "symptom_detach"
60+
#define COMSIG_SYMPTOM_TRIGGER "symptom_trigger"
61+
62+
#define COMSIG_CARBON_TAKE_BRUTE_DAMAGE "carbon_take_brute"

code/_globalvars/bitfields.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@ DEFINE_BITFIELD(disease_flags, list(
117117
"CAN_CARRY" = CAN_CARRY,
118118
"CAN_RESIST" = CAN_RESIST,
119119
"CURABLE" = CURABLE,
120+
"DORMANT" = DISEASE_DORMANT,
121+
"STAGE_COPY" = DISEASE_COPYSTAGE,
122+
"ANALYZED" = DISEASE_ANALYZED,
120123
))
121124

122125
DEFINE_BITFIELD(flags_1, list(

code/controllers/subsystem/processing/fastprocess.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ PROCESSING_SUBSYSTEM_DEF(actualfastprocess)
1212
PROCESSING_SUBSYSTEM_DEF(pathogen_processing)
1313
name = "Pathogen Cloud Processing"
1414
wait = 1 SECONDS
15-
stat_tag = "SP"
15+
stat_tag = "PC"

code/datums/components/infective.dm

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, PROC_REF(try_infect_buckle))
2626
RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(try_infect_collide))
2727
RegisterSignal(parent, COMSIG_MOVABLE_IMPACT_ZONE, PROC_REF(try_infect_impact_zone))
28-
RegisterSignal(parent, COMSIG_ATOM_EXTRAPOLATOR_ACT, PROC_REF(extrapolation))
2928
if(isitem(parent))
3029
RegisterSignal(parent, COMSIG_ITEM_ATTACK_ZONE, PROC_REF(try_infect_attack_zone))
3130
RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(try_infect_attack))
@@ -133,11 +132,3 @@
133132
if(length(contact) && !block)
134133
for(var/datum/disease/advanced/V as anything in contact)
135134
living.try_contact_infect(V, note="(Skin Contact - (Infective Component), coming from [src.parent])")
136-
137-
/datum/component/infective/proc/extrapolation(datum/source, mob/user, obj/item/extrapolator/E, scan = TRUE)
138-
SIGNAL_HANDLER
139-
140-
if(scan)
141-
E.scan(source, diseases, user)
142-
else
143-
INVOKE_ASYNC(E, TYPE_PROC_REF(/obj/item/extrapolator, extrapolate), source, diseases, user)

code/datums/diseases/_disease.dm

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(inspectable_diseases, list())
2222

2323
//Other
2424
var/list/viable_mobtypes = list() //typepaths of viable mobs
25-
var/mob/living/carbon/affected_mob = null
25+
var/mob/living/affected_mob = null
2626
var/list/cures = list() //list of cures if the disease has the CURABLE flag, these are reagent ids
2727
/// The probability of spreading through the air every second
2828
var/infectivity = 41
@@ -186,18 +186,29 @@ GLOBAL_LIST_INIT(inspectable_diseases, list())
186186
"subID",
187187
"uniqueID",
188188
"childID",
189-
"symptoms",
190189
"stageprob",
191190
"antigen",
192191
)
193192

194193
var/datum/disease/D = copy_type ? new copy_type() : new type()
194+
if(disease_flags & DISEASE_COPYSTAGE)
195+
D.stage = stage
196+
195197
for(var/V in copy_vars)
196198
var/val = vars[V]
197199
if(islist(val))
198200
var/list/L = val
199201
val = L.Copy()
200202
D.vars[V] = val
203+
204+
var/list/new_symptoms = list()
205+
for(var/datum/symptom/symptom as anything in symptoms)
206+
var/datum/symptom/copied_symptom = symptom.Copy()
207+
new_symptoms += copied_symptom
208+
SEND_SIGNAL(copied_symptom, COMSIG_SYMPTOM_ATTACH, D)
209+
210+
D.symptoms = new_symptoms
211+
201212
return D
202213

203214
/datum/disease/proc/after_add()

0 commit comments

Comments
 (0)