shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes the dangerrating variable, which is completely unused (#2157)

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-27 08:44:35 -05:00
committed by kevinz000
parent 53dc265b94
commit 269e2cbd64
6 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/gamemodes/devil/objectives.dm
View File

@@ -1,5 +1,4 @@
/datum/objective/devil
dangerrating = 5
/datum/objective/devil/soulquantity
explanation_text = "You shouldn't see this text. Error:DEVIL1"

1
code/game/gamemodes/miniantags/abduction/abductee_objectives.dm
View File

@@ -1,5 +1,4 @@
/datum/objective/abductee
dangerrating = 5
completed = 1
/datum/objective/abductee/random

1
code/game/gamemodes/miniantags/abduction/abduction.dm
View File

@@ -210,7 +210,6 @@
// OBJECTIVES
/datum/objective/experiment
dangerrating = 10
target_amount = 6
var/team

2
code/game/gamemodes/miniantags/revenant/revenant.dm
View File

@@ -419,7 +419,6 @@
//objectives
/datum/objective/revenant
dangerrating = 10
var/targetAmount = 100
/datum/objective/revenant/New()
@@ -439,7 +438,6 @@
return TRUE
/datum/objective/revenantFluff
dangerrating = 0
/datum/objective/revenantFluff/New()
var/list/explanationTexts = list("Assist and exacerbate existing threats at critical moments.", \

2
code/game/gamemodes/miniantags/sintouched/objectives.dm
View File

@@ -1,10 +1,8 @@
/datum/objective/sintouched
dangerrating = 5
completed = 1
/* NO ERP OBJECTIVE FOR YOU.
/datum/objective/sintouched/lust
dangerrating = 3 // it's not AS dangerous.
/datum/objective/sintouched/lust/New()
var/mob/dead/D = pick(dead_mob_list)

22
code/game/gamemodes/objective.dm
View File

@@ -4,7 +4,6 @@
var/datum/mind/target = null //If they are focused on a particular person.
var/target_amount = 0 //If they are focused on a particular number. Steal objectives have their own counter.
var/completed = 0 //currently only used for custom objectives.
var/dangerrating = 0 //How hard the objective is, essentially. Used for dishing out objectives and checking overall victory.
var/martyr_compatible = 0 //If the objective is compatible with martyr objective, i.e. if you can still do it while dead.
/datum/objective/New(var/text)
@@ -78,7 +77,6 @@
/datum/objective/assassinate
var/target_role_type=0
dangerrating = 10
martyr_compatible = 1
/datum/objective/assassinate/find_target_by_role(role, role_type=0, invert=0)
@@ -144,7 +142,6 @@
/datum/objective/maroon
var/target_role_type=0
dangerrating = 5
martyr_compatible = 1
/datum/objective/maroon/find_target_by_role(role, role_type=0, invert=0)
@@ -174,7 +171,6 @@
/datum/objective/debrain//I want braaaainssss
var/target_role_type=0
dangerrating = 20
/datum/objective/debrain/find_target_by_role(role, role_type=0, invert=0)
if(!invert)
@@ -207,7 +203,6 @@
/datum/objective/protect//The opposite of killing a dude.
var/target_role_type=0
dangerrating = 10
martyr_compatible = 1
/datum/objective/protect/find_target_by_role(role, role_type=0, invert=0)
@@ -236,7 +231,6 @@
/datum/objective/hijack
explanation_text = "Hijack the shuttle to ensure no loyalist Nanotrasen crew escape alive and out of custody."
dangerrating = 25
martyr_compatible = 0 //Technically you won't get both anyway.
/datum/objective/hijack/check_completion()
@@ -253,7 +247,6 @@
/datum/objective/hijackclone
explanation_text = "Hijack the emergency shuttle by ensuring only you (or your copies) escape."
dangerrating = 25
martyr_compatible = 0
/datum/objective/hijackclone/check_completion()
@@ -286,7 +279,6 @@
/datum/objective/block
explanation_text = "Do not allow any organic lifeforms to escape on the shuttle alive."
dangerrating = 25
martyr_compatible = 1
/datum/objective/block/check_completion()
@@ -308,7 +300,6 @@
/datum/objective/purge
explanation_text = "Ensure no mutant humanoid species are present aboard the escape shuttle."
dangerrating = 25
martyr_compatible = 1
/datum/objective/purge/check_completion()
@@ -326,7 +317,6 @@
/datum/objective/robot_army
explanation_text = "Have at least eight active cyborgs synced to you."
dangerrating = 25
martyr_compatible = 0
/datum/objective/robot_army/check_completion()
@@ -346,7 +336,6 @@
/datum/objective/escape
explanation_text = "Escape on the shuttle or an escape pod alive and without being in custody."
dangerrating = 5
/datum/objective/escape/check_completion()
if(issilicon(owner.current))
@@ -374,7 +363,6 @@
return 0
/datum/objective/escape/escape_with_identity
dangerrating = 10
var/target_real_name // Has to be stored because the target's real_name can change over the course of the round
var/target_missing_id
@@ -413,7 +401,6 @@
/datum/objective/survive
explanation_text = "Stay alive until the end."
dangerrating = 3
/datum/objective/survive/check_completion()
if(!owner.current || owner.current.stat == DEAD || isbrain(owner.current))
@@ -425,7 +412,6 @@
/datum/objective/martyr
explanation_text = "Die a glorious death."
dangerrating = 1
/datum/objective/martyr/check_completion()
if(!owner.current) //Gibbed, etc.
@@ -448,7 +434,6 @@ GLOBAL_LIST_EMPTY(possible_items)
/datum/objective/steal
var/datum/objective_item/targetinfo = null //Save the chosen item datum so we can access it later.
var/obj/item/steal_target = null //Needed for custom objectives (they're just items, not datums).
dangerrating = 5 //Overridden by the individual item's difficulty, but defaults to 5 for custom objectives.
martyr_compatible = 0
/datum/objective/steal/get_target()
@@ -472,7 +457,6 @@ GLOBAL_LIST_EMPTY(possible_items)
steal_target = targetinfo.targetitem
explanation_text = "Steal [targetinfo.name]."
dangerrating = targetinfo.difficulty
give_special_equipment(targetinfo.special_equipment)
return steal_target
else
@@ -530,7 +514,6 @@ GLOBAL_LIST_EMPTY(possible_items_special)
return set_target(pick(GLOB.possible_items_special))
/datum/objective/steal/exchange
dangerrating = 10
martyr_compatible = 0
/datum/objective/steal/exchange/proc/set_faction(faction,otheragent)
@@ -552,7 +535,6 @@ GLOBAL_LIST_EMPTY(possible_items_special)
/datum/objective/steal/exchange/backstab
dangerrating = 3
/datum/objective/steal/exchange/backstab/set_faction(faction)
if(faction == "red")
@@ -564,7 +546,6 @@ GLOBAL_LIST_EMPTY(possible_items_special)
/datum/objective/download
dangerrating = 10
/datum/objective/download/proc/gen_amount_goal()
target_amount = rand(10,20)
@@ -600,7 +581,6 @@ GLOBAL_LIST_EMPTY(possible_items_special)
/datum/objective/capture
dangerrating = 10
/datum/objective/capture/proc/gen_amount_goal()
target_amount = rand(5,10)
@@ -640,7 +620,6 @@ GLOBAL_LIST_EMPTY(possible_items_special)
/datum/objective/absorb
dangerrating = 10
/datum/objective/absorb/proc/gen_amount_goal(lowbound = 4, highbound = 6)
target_amount = rand (lowbound,highbound)
@@ -668,7 +647,6 @@ GLOBAL_LIST_EMPTY(possible_items_special)
/datum/objective/destroy
dangerrating = 10
martyr_compatible = 1
/datum/objective/destroy/find_target()