From 9f3deaa9f408c0a1ffb0378d7e0863a39a9045ed Mon Sep 17 00:00:00 2001 From: "musketstgstation@gmail.com" Date: Sat, 16 Jul 2011 23:06:24 +0000 Subject: [PATCH] Fixed hat crate contents randomisation. Hat crates now cost 200 points but start unlocked. Fixed several issues preventing the game from compiling. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1869 316c924e-a436-60f5-8080-3fe189b3f50e --- code/datums/diseases/appendicitis.dm | 39 +++ code/defines/obj/supplypacks.dm | 9 +- code/defines/obj/weapon.dm | 2 +- code/game/objects/storage/crates.dm | 6 +- tgstation.dme | 404 +-------------------------- 5 files changed, 52 insertions(+), 408 deletions(-) create mode 100644 code/datums/diseases/appendicitis.dm diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm new file mode 100644 index 00000000000..be728403089 --- /dev/null +++ b/code/datums/diseases/appendicitis.dm @@ -0,0 +1,39 @@ +/datum/disease/appendicitis + form = "Condition" + name = "Appendicitis" + max_stages = 3 + spread = "Acute" + cure = "Surgery" + agent = "Shitty Appendix" + affected_species = list("Human") + permeability_mod = 1 + contagious_period = 9001 //slightly hacky, but hey! whatever works, right? + desc = "If left untreated the subject will become very weak, and may vomit often." + severity = "Medium" + longevity = 1000 + hidden = list(0, 1) + +/datum/disease/appendicitis/stage_act() + ..() + switch(stage) + if(1) + if(prob(5)) affected_mob.emote("cough") + if(2) + if(prob(3)) + affected_mob << "\red You feel a stabbing pain in your abdomen!" + affected_mob.stunned = rand(2,3) + affected_mob.toxloss += 1 + if(3) + if(prob(1)) + if (affected_mob.nutrition > 100) + affected_mob.stunned = rand(4,6) + affected_mob << "\red You throw up!" + var/turf/location = affected_mob.loc + if (istype(location, /turf/simulated)) + location.add_vomit_floor(affected_mob) + affected_mob.nutrition -= 95 + affected_mob:toxloss = max(affected_mob:toxloss-1,0) + else + affected_mob << "\red You gag as you want to throw up, but there's nothing in your stomach!" + affected_mob.weakened += 10 + affected_mob.toxloss += 3 \ No newline at end of file diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index 7400cd663c7..96f8b2d00e9 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -432,7 +432,7 @@ containertype = "/obj/crate/secure/gear" containername = "Secruity Barriers crate" -datum/supply_packs/hats/ +/datum/supply_packs/hats/ contains = list("/obj/item/clothing/head/collectable/chef", "/obj/item/clothing/head/collectable/paper", "/obj/item/clothing/head/collectable/tophat", @@ -462,4 +462,11 @@ datum/supply_packs/hats/ containertype = "/obj/crate/hat" containername = "Collectable Hats Crate! Brought to you by Bass.inc!" +/datum/supply_packs/hats/New() + var/list/tempContains = list() + for(var/i = 0,i