mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 18:44:48 +01:00
Removed zombies, added Skellingtons for halloween. Some bug fixes
This commit is contained in:
@@ -3619,64 +3619,3 @@ datum
|
||||
return
|
||||
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
//Grutor
|
||||
/////////////////Zombie Stuff//////////////////
|
||||
|
||||
//This isn't implemented yet, future updates might change this
|
||||
necroblood
|
||||
name = "Zombie blood"
|
||||
id = "necroblood"
|
||||
description = "It's blood, but it looks like jello."
|
||||
reagent_state = LIQUID
|
||||
|
||||
//So you don't need to be a virologist
|
||||
necrocure
|
||||
name = "Zombie Cure"
|
||||
id = "necrocure"
|
||||
description = "The thing only stopping you from turning."
|
||||
reagent_state = LIQUID
|
||||
nutriment_factor = 0
|
||||
color = "#54C754" // rgb: 84, 199, 84
|
||||
|
||||
z_meat
|
||||
name = "Zombie Juice"
|
||||
id = "zmeat"
|
||||
description = "Definitely smells funny."
|
||||
reagent_state = LIQUID
|
||||
color = "#E23351"
|
||||
var/said_it_before = 0
|
||||
var/fate_is_sealed = 0
|
||||
|
||||
on_mob_life(var/mob/living/M as mob)
|
||||
..()
|
||||
if(said_it_before == 0)
|
||||
M << "You are starting to have regrets..."
|
||||
said_it_before = 1
|
||||
if(prob(8) && istype(M, /mob/living/carbon) && fate_is_sealed == 0) //Per reagent tick there is a chance this person will explode
|
||||
fate_is_sealed = 1
|
||||
sleep(rand(80, 250))
|
||||
for(var/obj/item/W in M) //Some items will not be recovered..
|
||||
if(prob(70))
|
||||
M.drop_from_inventory(W)
|
||||
M.gib()
|
||||
return
|
||||
|
||||
necrovirus
|
||||
name = "Zombie Virus"
|
||||
id = "necrodisease"
|
||||
description = "It's said it can bring the dead back to life."
|
||||
reagent_state = SOLID
|
||||
|
||||
on_mob_life(var/mob/living/carbon/M as mob)
|
||||
if(!M) M = holder.my_atom
|
||||
var/datum/disease/D = new /datum/disease/zombie_transformation
|
||||
D.holder = M
|
||||
D.affected_mob = M
|
||||
M.viruses += D
|
||||
..()
|
||||
return
|
||||
|
||||
*/
|
||||
@@ -1976,24 +1976,3 @@ datum
|
||||
|
||||
*/
|
||||
|
||||
|
||||
//Grutor
|
||||
///////////////////////Zombie recipes////////////////////////////
|
||||
|
||||
/* necrocure
|
||||
name = "Zombie Cure"
|
||||
id = "necrocure"
|
||||
result = "necrocure"
|
||||
required_reagents = list("sterilizine" = 2, "zmeat" = 2)
|
||||
result_amount = 5
|
||||
|
||||
necrodisease
|
||||
name = "Zombie Virus"
|
||||
id = "necrodisease"
|
||||
result = "necrodisease"
|
||||
required_reagents = list("zombiepowder" = 2, "cryptobiolin" = 2, "mutagen" = 2)
|
||||
result_amount = 5
|
||||
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@@ -25,20 +25,3 @@
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/corgi
|
||||
name = "Corgi meat"
|
||||
desc = "Tastes like... well you know..."
|
||||
|
||||
//Grutor
|
||||
//zombies yum...
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/undead
|
||||
name = "Rotten flesh"
|
||||
desc = "You really shouldn't..."
|
||||
icon = 'icons/obj/food.dmi'
|
||||
icon_state = "rottenmeat"
|
||||
|
||||
attack(mob/M as mob, mob/user as mob, def_zone)
|
||||
if(..())
|
||||
M << "You are starting to have regrets..." //If you seeing this message twice, remove this one.
|
||||
|
||||
New()
|
||||
..()
|
||||
reagents.add_reagent("carpotoxin", 6)
|
||||
reagents.add_reagent("zmeat", 20)
|
||||
|
||||
Reference in New Issue
Block a user