mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-29 23:17:02 +01:00
Fixed damagetypes not working in admin investigate (The (?) button when someone adminhelps)
Committing for Zekkeit/39kk9t - Attack logs now display the reagents the pill/snack had when you forced it down someone's throat. - List entries can now be edited and deleted! (don't try editing any of the contents list entries, it spits a runtime and I don't know how to make it uneditable) - Fix for issue 598. Now pAI carriers can re-enable the pAI radio settings. - Adminmoreinfo now displays the status of the mob. - Added a confirmation message to unjobbanning from the Display Job bans panel. - When being exposed to a virus, resistances are now taken into account. In addition, list entries that contained a virus that has been cured are now deleted. Proposed commit: http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=9262 git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4008 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -8,7 +8,7 @@ Put (mob/proc)s here that are in dire need of a code cleanup.
|
||||
// This proc has some procs that should be extracted from it. I believe we can develop some helper procs from it - Rockdtben
|
||||
/mob/proc/contract_disease(var/datum/disease/virus, var/skip_this = 0, var/force_species_check=1)
|
||||
// world << "Contract_disease called by [src] with virus [virus]"
|
||||
if(stat >=2) return
|
||||
if(stat >=2 || src.resistances.Find(virus.type)) return
|
||||
|
||||
//This gives a chance to re-infect cured/vaccinated mobs
|
||||
// if(virus.type in resistances)
|
||||
@@ -59,7 +59,7 @@ Put (mob/proc)s here that are in dire need of a code cleanup.
|
||||
clothing_areas[Covers] += Clothing
|
||||
|
||||
*/
|
||||
if(prob(15/virus.permeability_mod)) return //the power of immunity compels this disease!
|
||||
if(prob(15/virus.permeability_mod)) return //the power of immunity compels this disease! but then you forgot resistances
|
||||
|
||||
var/obj/item/clothing/Cl = null
|
||||
var/passed = 1
|
||||
|
||||
Reference in New Issue
Block a user