cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-03-27 21:52:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1212 from ArchieBeepBoop/heirloomstuff

Browse Source 
Adminbus heirloom objective
This commit is contained in:
Dahlular
2021-06-01 16:24:40 -06:00
committed by GitHub
parent 1f2e31160c 4925c15e49
commit f3aa289a68
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/datums/mind.dm
View File

@@ -471,7 +471,7 @@
else
target_antag = target
var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "maroon", "debrain", "protect", "destroy", "prevent", "hijack", "escape", "survive", "martyr", "steal", "download", "nuclear", "capture", "absorb", "noncon", "custom")
var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "maroon", "debrain", "protect", "destroy", "prevent", "hijack", "escape", "survive", "martyr", "heirloom", "steal", "download", "nuclear", "capture", "absorb", "noncon", "custom")
if (!new_obj_type)
return
@@ -541,6 +541,12 @@
new_objective = new /datum/objective/nuclear
new_objective.owner = src
if ("heirloom")
new_objective = new /datum/objective/hoard/heirloom
new_objective.owner = src
var/datum/objective/hoard/heirloom/heirloom = new_objective
heirloom.find_target()
if ("steal")
if (!istype(objective, /datum/objective/steal))
new_objective = new /datum/objective/steal

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

@@ -894,7 +894,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
/datum/objective/hoard/proc/set_target(obj/item/I)
if(I)
hoarded_item = I
explanation_text = "Keep [I] on your person at all times."
explanation_text = "Steal and keep [I] heirloom on your person at all times."
return hoarded_item
else
explanation_text = "Free objective"