mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +01:00
Tigercat2000
ad2cf86898
Wee! Readds Disease1, kills off disease2, and finally removes poop.dmi
(fucking piece of shit)
Needs WAY more testing, most of which I don't know how to do yet, because
I've never used this system. Fun!
Changes:
- Virus2 has been removed completely.
- Some symptoms have not been readded. Aka, none of them have been
readded, I just wanted to get this shit ported.
- Virology has been updated slightly to mirror -tg-'s boxstation, as the
virus2 machines are gone.
- Welcome back, disease1
- The centrifuge, vials, splicer, analyzer, growerthing, have all been
replaced by the PanD.E.M.I.C. 2220
- No symptoms have been completely removed; However, vision symptoms
have been disabled pending byond 510, and genetics symptoms have been
disabled until "when I figure out how to fix them".
- Advanced Mutation Toxin now uses a disease, which turns people from
species, to slime person, to slime. Slime people are instantly turned
to a slime.
- Diseased touch now give people appendicitis. Yes, they VANT YOUR...
appendix.
- Virology now has a fridge with the following in it:
- Antiviral Syringes
- 1 Rhinovirus culture
- 1 Flu culture
- 1 Bottle of Mutagen
- 1 Bottle of Plasma
- 1 Bottle of Synaptizine
- A few more things, which I can't remember and can't look at while writing
this commit. Sometimes, git hurts.
TODO:
- Test more shit and figure out how the PanD.E.M.I.C. works/is supposed to
work.
- Fix genetics symptoms.
- Give vampires a less shitty diseased touch.
- Add appendicitis event.
-
40 lines
1.0 KiB
Plaintext
40 lines
1.0 KiB
Plaintext
/mob/living/carbon/hitby(atom/movable/AM)
|
|
if(in_throw_mode && !get_active_hand()) //empty active hand and we're in throw mode
|
|
if(canmove && !restrained())
|
|
if(istype(AM, /obj/item))
|
|
var/obj/item/I = AM
|
|
if(isturf(I.loc))
|
|
put_in_active_hand(I)
|
|
visible_message("<span class='warning'>[src] catches [I]!</span>")
|
|
throw_mode_off()
|
|
return
|
|
..()
|
|
|
|
/mob/living/carbon/water_act(volume, temperature, source)
|
|
if(volume > 10) //anything over 10 volume will make the mob wetter.
|
|
wetlevel = min(wetlevel + 1,5)
|
|
..()
|
|
|
|
|
|
/mob/living/carbon/attackby(obj/item/I, mob/user, params)
|
|
if(lying)
|
|
if(surgeries.len)
|
|
if(user != src && user.a_intent == "help")
|
|
for(var/datum/surgery/S in surgeries)
|
|
if(S.next_step(user, src))
|
|
return 1
|
|
..()
|
|
|
|
/mob/living/carbon/attack_hand(mob/living/carbon/human/user)
|
|
if(!iscarbon(user))
|
|
return
|
|
|
|
for(var/datum/disease/D in viruses)
|
|
if(D.IsSpreadByTouch())
|
|
user.ContractDisease(D)
|
|
|
|
for(var/datum/disease/D in user.viruses)
|
|
if(D.IsSpreadByTouch())
|
|
ContractDisease(D)
|
|
return 0
|