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

it compiles now, ready for testmerge probs

Browse Source
This commit is contained in:
Putnam
2020-01-27 19:09:04 -08:00
parent 233aeaa456
commit 8df9a051ec
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/objective.dm
+4 -2
View File
@@ -1042,10 +1042,12 @@ GLOBAL_LIST_EMPTY(cult_contraband)
/datum/objective/hoard/collector/find_target() /datum/objective/hoard/collector/find_target()
var/obj/item/I var/obj/item/I
var/I_type
if(prob(50)) if(prob(50))
I = new pick_and_take(GLOB.traitor_contraband) // always unique unless it's run out, in which case we refill it anyway I_type = pick_n_take(GLOB.traitor_contraband) // always unique unless it's run out, in which case we refill it anyway
else else
I = new pick_and_take(GLOB.cult_contraband) I_type = pick_n_take(GLOB.cult_contraband)
I = new I_type
I.forceMove(get_turf(owner)) I.forceMove(get_turf(owner))
if(ishuman(owner)) if(ishuman(owner))
var/mob/living/carbon/human/H = owner var/mob/living/carbon/human/H = owner