cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1146 from Fox-McCloud/Virus-Tweaks

Browse Source 
Virus Tweaks
This commit is contained in:
ZomgPonies
2015-05-24 00:50:13 -04:00
parent 8e11d0ec6a abed5764d0
commit 46d9148fd7
5 changed files with 67 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/mob.dm
+10 -1
View File
@@ -918,7 +918,7 @@ var/list/slot_equipment_priority = list( \
if(mind && istype(src, /mob/living) && mind.spell_list && mind.spell_list.len)
for(var/obj/effect/proc_holder/spell/wizard/S in mind.spell_list)
add_spell_to_statpanel(S)
if(client && client.holder)
@@ -1469,6 +1469,15 @@ mob/proc/yank_out_object()
location.add_vomit_floor(src, 1)
playsound(location, 'sound/effects/splat.ogg', 50, 1)
/mob/proc/fakepoop() //for aesthetic craps. Whyyyyy -Fox
if(stat==DEAD)
return
var/turf/location = loc
if (istype(location, /turf/simulated))
src.visible_message("<span class='warning'>[src] has explosive diarrhea all over the floor!</span>","<span class='warning'>You have explosive diarrhea all over the floor!</span>")
location.add_poop_floor()
playsound(location, 'sound/effects/splat.ogg', 50, 1)
/mob/proc/AddSpell(var/obj/effect/proc_holder/spell/spell)
spell_list += spell
if(!spell.action)
code/modules/reagents/Chemistry-Reagents.dm
+19 -7
View File
@@ -1381,19 +1381,31 @@ datum
return
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
/*
nanites
nanomachines
name = "Nanomachines"
id = "nanites"
id = "nanomachines"
description = "Microscopic construction robots."
reagent_state = LIQUID
color = "#535E66" // rgb: 83, 94, 102
reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
src = null
if( (prob(10) && method==TOUCH) || method==INGEST)
M.contract_disease(new /datum/disease/robotic_transformation(0),1)
on_mob_life(var/mob/living/M as mob)
var/datum/disease2/disease/borg = new /datum/disease2/disease
var/datum/disease2/effectholder/holder = new /datum/disease2/effectholder
var/datum/disease2/effect/borg/O = new /datum/disease2/effect/borg
holder.effect += O
holder.chance = 10
borg.infectionchance = 100
borg.antigen |= text2num(pick(ANTIGENS))
borg.spreadtype = "None"
borg.uniqueID = 1337
borg.effects += holder
borg.speed = 1
borg.stage = 2
borg.clicks = 185
infect_virus2(M,borg,0)
/*
xenomicrobes
name = "Xenomicrobes"
id = "xenomicrobes"
code/modules/reagents/reagent_containers/food/snacks.dm
+1 -2
View File
@@ -928,8 +928,7 @@
New()
..()
reagents.add_reagent("nutriment", 2)
if(prob(5))
reagents.add_reagent("nanites", 2)
reagents.add_reagent("nanomachines", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/roburgerbig
code/modules/reagents/reagent_containers/glass/bottle.dm
+1 -1
View File
@@ -275,4 +275,4 @@
New()
..()
reagents.add_reagent(pick("polonium","initropidril","concentrated_initro","pancuronium","sodium_thiopental","ketamine","sulfonal","amanitin","coniine","curare","sarin","histamine","venom","cyanide"), 40)
reagents.add_reagent(pick("polonium","initropidril","concentrated_initro","pancuronium","sodium_thiopental","ketamine","sulfonal","amanitin","coniine","curare","sarin","histamine","venom","cyanide", "nanomachines"), 40)
code/modules/virus2/effect.dm
+36 -73
View File
@@ -104,12 +104,28 @@
////////////////////////STAGE 4/////////////////////////////////
/datum/disease2/effect/borg
name = "Borgification Disorder"
stage = 4
badness = 2
activate(var/mob/living/carbon/mob,var/multiplier)
mob << "\red You feel like booping and beeping."
if(prob(50))
var/location = get_turf(mob.loc)
if(mob.client)
mob.client.mob = new/mob/living/silicon/robot(location)
else
new/mob/living/silicon/robot(location)
var/datum/disease2/disease/D = mob.virus2
mob.gib()
del D
/datum/disease2/effect/omnizine
name = "Panacea Effect"
stage = 4
activate(var/mob/living/carbon/mob,var/multiplier)
if (mob.reagents.get_reagent_amount("omnizine") < 1)
mob.reagents.add_reagent("omnizine", 1)
if (mob.reagents.get_reagent_amount("omnizine") < 2)
mob.reagents.add_reagent("omnizine", 2)
/datum/disease2/effect/viralsputum_major
name = "Hemoptysis"
@@ -250,14 +266,6 @@
var/heal_amt = -5*multiplier
mob.apply_damages(heal_amt,heal_amt,heal_amt,heal_amt)
deactivate(var/mob/living/carbon/mob,var/multiplier)
if(istype(mob, /mob/living/carbon/human))
var/mob/living/carbon/human/H = mob
H << "<span class='notice'>You suddenly feel hurt and old...</span>"
H.age += 8
var/backlash_amt = 5*multiplier
mob.apply_damages(backlash_amt,backlash_amt,backlash_amt,backlash_amt)
/datum/disease2/effect/gmagnitis
name = "Greater Magnitis"
stage = 4
@@ -350,47 +358,6 @@
return
/datum/disease2/effect/fizzle
name = "Fizzle Effect"
stage = 4
activate(var/mob/living/carbon/mob,var/multiplier)
mob.emote("me",1,pick("sniffles...", "clears their throat..."))
/* commented out for now, fuck spiders
/datum/disease2/effect/spider
name = "Arachnogenesis Effect"
stage = 4
activate(var/mob/living/carbon/mob,var/multiplier)
//var/mob/living/carbon/human/H = mob
var/placemob = locate(mob.x + pick(1,-1), mob.y, mob.z)
playsound(mob.loc, 'sound/effects/splat.ogg', 50, 1)
new /obj/effect/spider/spiderling(placemob)
mob.emote("me",1,"vomits up a live spider!")
*/
/*
/datum/disease2/effect/orbweapon //peopel are just griefing the shit out of each other with this..and with a constantly regenerating weapon that has a throwforce of 30? I can see why.
name = "Biolobulin Effect"
stage = 4
activate(var/mob/living/carbon/mob,var/multiplier)
var/obj/item/toy/snappop/virus = new /obj/item/toy/snappop/virus
mob.equip_to_slot(virus, slot_l_hand)
/obj/item/clothing/mask/gas/virusclown_hat
dropped(mob/user as mob)
flags &= ~NODROP
..()
equipped(var/mob/user, var/slot)
if (slot == slot_l_hand)
flags &= ~NODROP //curses!
..()
*/
/datum/disease2/effect/plasma
name = "Toxin Sublimation"
stage = 4
@@ -419,15 +386,15 @@
name = "Regenerative Synapse Effect"
stage = 3
activate(var/mob/living/carbon/mob,var/multiplier)
if (mob.reagents.get_reagent_amount("mannitol") < 1)
mob.reagents.add_reagent("mannitol", 1)
if (mob.reagents.get_reagent_amount("mannitol") < 10)
mob.reagents.add_reagent("mannitol", 10)
/datum/disease2/effect/paroxetine
/datum/disease2/effect/haloperidol
name = "Psyche Collapse Syndrome"
stage = 3
activate(var/mob/living/carbon/mob,var/multiplier)
if (mob.reagents.get_reagent_amount("paroxetine") < 10)
mob.reagents.add_reagent("paroxetine", 1)
if (mob.reagents.get_reagent_amount("haloperidol") < 10)
mob.reagents.add_reagent("haloperidol", 1)
/datum/disease2/effect/pain_major
name = "Phantom Pain Syndrome"
@@ -798,7 +765,7 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
name = "Adrenal Overload"
stage = 2
activate(var/mob/living/carbon/mob,var/multiplier)
if (mob.reagents.get_reagent_amount("methamphetamine") < 40)
if (mob.reagents.get_reagent_amount("methamphetamine") < 5)
mob.reagents.add_reagent("methamphetamine", 4)
if (prob(30))
mob << "<span class='notice'>You feel a rush of energy inside you!</span>"
@@ -822,7 +789,6 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
mob.overeatduration = 1000
/datum/disease2/effect/beard
name = "Bearding"
stage = 2
@@ -835,21 +801,6 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
H.f_style = "Full Beard"
H.update_hair()
/datum/disease2/effect/poop
name = "Uncontrollable Bowel Syndrome"
stage = 2
activate(var/mob/living/carbon/mob,var/multiplier)
if (prob(70)) // Bone White - Lessened the chance for actually shitting yourself.
mob << "<span class='notice'>[pick("Your stomach rumbles strangely.", "You feel like you're going shit your pants any second now!")]</span>"
else
mob.visible_message("<B>[mob]</B> has explosive diarrhea all over the floor!")
mob.nutrition -= 20
mob.adjustToxLoss(-3)
var/obj/effect/decal/cleanable/poop/P = new(get_turf(mob))
P.virus2 = virus_copylist(mob.virus2)
playsound(P.loc, 'sound/effects/splat.ogg', 50, 1)
/datum/disease2/effect/bloodynose
name = "Intranasal Hemorrhage"
stage = 2
@@ -881,6 +832,18 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon
////////////////////////STAGE 1/////////////////////////////////
/datum/disease2/effect/poop
name = "Uncontrollable Bowel Syndrome"
stage = 1
activate(var/mob/living/carbon/mob,var/multiplier)
mob.fakepoop()
/datum/disease2/effect/vomit
name = "Projectile Vomit Syndrome"
stage = 1
activate(var/mob/living/carbon/mob,var/multiplier)
mob.fakevomit()
/datum/disease2/effect/pain_minor
name = "Heightened Sensitivity"