mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
[MIRROR] space cleanup (#10414)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
3ef8163aa0
commit
789db280cc
@@ -232,11 +232,11 @@ GLOBAL_LIST_INIT(advance_cures, list(
|
||||
severity = "Unknown"
|
||||
|
||||
/datum/disease/advance/proc/GenerateCure(list/properties = list())
|
||||
if(properties && length(properties))
|
||||
var/res = clamp(properties["resistance"] - (length(symptoms) / 2), 1, length(GLOB.advance_cures))
|
||||
cures = list(GLOB.advance_cures[res])
|
||||
cure_text = cures[1]
|
||||
return
|
||||
if(properties && length(properties))
|
||||
var/res = clamp(properties["resistance"] - (length(symptoms) / 2), 1, length(GLOB.advance_cures))
|
||||
cures = list(GLOB.advance_cures[res])
|
||||
cure_text = cures[1]
|
||||
return
|
||||
|
||||
// Randomly generate a symptom, has a chance to lose or gain a symptom.
|
||||
/datum/disease/advance/proc/Evolve(min_level, max_level)
|
||||
|
||||
@@ -16,13 +16,13 @@ Bonus
|
||||
*/
|
||||
|
||||
/datum/symptom/infect_synthetics
|
||||
name = "Synthetic Infection"
|
||||
stealth = 1
|
||||
resistance = 2
|
||||
stage_speed = 0
|
||||
transmittable = 1
|
||||
level = 5
|
||||
severity = 3
|
||||
name = "Synthetic Infection"
|
||||
stealth = 1
|
||||
resistance = 2
|
||||
stage_speed = 0
|
||||
transmittable = 1
|
||||
level = 5
|
||||
severity = 3
|
||||
|
||||
/datum/symptom/infect_synthetics/Start(datum/disease/advance/A)
|
||||
A.infect_synthetics = TRUE
|
||||
|
||||
@@ -304,7 +304,7 @@
|
||||
/obj/item/gun/projectile/revolver/nova,
|
||||
/obj/item/gun/projectile/revolver/detective,
|
||||
/obj/item/gun/projectile/revolver/deckard,
|
||||
/obj/item/gun/projectile/revolver/mateba,
|
||||
/obj/item/gun/projectile/revolver/mateba,
|
||||
/obj/item/gun/projectile/derringer
|
||||
)
|
||||
cost = 150
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
/datum/supply_pack/musical/strings
|
||||
contains = list(
|
||||
/obj/item/instrument/violin,
|
||||
/obj/item/instrument/banjo,
|
||||
/obj/item/instrument/guitar,
|
||||
/obj/item/instrument/eguitar,
|
||||
)
|
||||
/obj/item/instrument/violin,
|
||||
/obj/item/instrument/banjo,
|
||||
/obj/item/instrument/guitar,
|
||||
/obj/item/instrument/eguitar,
|
||||
)
|
||||
name = "string instruments"
|
||||
desc = "A set of string instruments."
|
||||
cost = 50
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
/datum/supply_pack/musical/wind
|
||||
contains = list(
|
||||
/obj/item/instrument/accordion,
|
||||
/obj/item/instrument/trumpet,
|
||||
/obj/item/instrument/saxophone,
|
||||
/obj/item/instrument/trombone,
|
||||
/obj/item/instrument/recorder,
|
||||
/obj/item/instrument/harmonica,
|
||||
/obj/item/instrument/bikehorn,
|
||||
)
|
||||
/obj/item/instrument/accordion,
|
||||
/obj/item/instrument/trumpet,
|
||||
/obj/item/instrument/saxophone,
|
||||
/obj/item/instrument/trombone,
|
||||
/obj/item/instrument/recorder,
|
||||
/obj/item/instrument/harmonica,
|
||||
/obj/item/instrument/bikehorn,
|
||||
)
|
||||
name = "wind instruments"
|
||||
desc = "A set of wind instruments."
|
||||
cost = 50
|
||||
@@ -29,10 +29,10 @@
|
||||
|
||||
/datum/supply_pack/musical/keys
|
||||
contains = list(
|
||||
/obj/item/instrument/piano_synth,
|
||||
/obj/item/instrument/glockenspiel, // cough
|
||||
/obj/item/instrument/musicalmoth
|
||||
)
|
||||
/obj/item/instrument/piano_synth,
|
||||
/obj/item/instrument/glockenspiel, // cough
|
||||
/obj/item/instrument/musicalmoth
|
||||
)
|
||||
name = "keyed instruments"
|
||||
desc = "A set of keyboard-style instruments."
|
||||
cost = 50
|
||||
|
||||
Reference in New Issue
Block a user