cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13458 from Probe1/removes_mining_objectives_from_heist

Browse Source 
Comments out "Steal minerals" objectives for Vox Raiders. 
<probe1> and I'm sure my PR is fine
This commit is contained in:
Rob Nelson
2017-01-27 11:21:17 -08:00
committed by GitHub
parent d61e203c96 f45811d39c
commit c094e8ae57
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,7 +175,7 @@
raid_objectives += new/datum/objective/heist/kidnap
raid_objectives += new/datum/objective/steal/heist
raid_objectives += new/datum/objective/steal/salvage
//raid_objectives += new/datum/objective/steal/salvage
raid_objectives += new/datum/objective/heist/inviolate_crew
raid_objectives += new/datum/objective/heist/inviolate_death

4
code/game/gamemodes/heist/objectives.dm
View File

@@ -155,7 +155,7 @@
/*
* salvage
*/
/datum/objective/steal/salvage
target_category = "salvage"
@@ -226,3 +226,5 @@
typepath = /obj/item/stack/sheet/mineral/diamond
min = 20
max = 20
*/

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

@@ -3,8 +3,8 @@
var/list/potential_theft_objectives=list(
"traitor" = typesof(/datum/theft_objective/traitor) - /datum/theft_objective/traitor,
"special" = typesof(/datum/theft_objective/special) - /datum/theft_objective/special,
"heist" = typesof(/datum/theft_objective/number/heist) - /datum/theft_objective/number/heist,
"salvage" = typesof(/datum/theft_objective/number/salvage) - /datum/theft_objective/number/salvage
"heist" = typesof(/datum/theft_objective/number/heist) - /datum/theft_objective/number/heist
//"salvage" = typesof(/datum/theft_objective/number/salvage) - /datum/theft_objective/number/salvage
)

2
code/modules/events/heist.dm
View File

@@ -158,7 +158,7 @@ var/global/list/datum/mind/raiders = list() //Antags.
if(prob(25)) // This is an asspain.
raid_objectives += new /datum/objective/heist/kidnap
raid_objectives += new /datum/objective/steal/heist
raid_objectives += new /datum/objective/steal/salvage
//raid_objectives += new /datum/objective/steal/salvage
raid_objectives += new /datum/objective/heist/inviolate_crew
raid_objectives += new /datum/objective/heist/inviolate_death