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

Merge pull request #13412 from Putnam3145/supermatter-bad

Browse Source 
Removed the supermatter sabotage objective; reworked non-murder MI13 objective picking.
This commit is contained in:
silicons
2020-09-27 00:09:56 -07:00
committed by GitHub
parent 0613951a17 63b0d61c5b
commit e602284bcb
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/objective_sabotage.dm
+2 -2
View File
@@ -56,7 +56,7 @@
<li>There are many other ways; be creative!</li>\ <li>There are many other ways; be creative!</li>\
</ul>" </ul>"
/datum/sabotage_objective/processing/supermatter /*/datum/sabotage_objective/processing/supermatter
name = "Sabotage the supermatter so that it goes under 50% integrity. If it is delaminated, you will fail." name = "Sabotage the supermatter so that it goes under 50% integrity. If it is delaminated, you will fail."
sabotage_type = "supermatter" sabotage_type = "supermatter"
special_equipment = list(/obj/item/paper/guides/antag/supermatter_sabotage) special_equipment = list(/obj/item/paper/guides/antag/supermatter_sabotage)
@@ -77,7 +77,7 @@
/datum/sabotage_objective/processing/supermatter/can_run() /datum/sabotage_objective/processing/supermatter/can_run()
return (locate(/obj/machinery/power/supermatter_crystal) in GLOB.machines) return (locate(/obj/machinery/power/supermatter_crystal) in GLOB.machines)
/*
/datum/sabotage_objective/station_integrity /datum/sabotage_objective/station_integrity
name = "Make sure the station is at less than 80% integrity by the end. Smash walls, windows etc. to reach this goal." name = "Make sure the station is at less than 80% integrity by the end. Smash walls, windows etc. to reach this goal."
sabotage_type = "integrity" sabotage_type = "integrity"
code/modules/antagonists/traitor/classes/subterfuge.dm
+20 -15
View File
@@ -23,18 +23,23 @@
maroon_objective.find_target() maroon_objective.find_target()
T.add_objective(maroon_objective) T.add_objective(maroon_objective)
else else
if(prob(15) && !(locate(/datum/objective/download) in T.objectives) && !(T.owner.assigned_role in list("Research Director", "Scientist", "Roboticist"))) var/list/weights = list()
var/datum/objective/download/download_objective = new weights["sabo"] = length(subtypesof(/datum/sabotage_objective))
download_objective.owner = T.owner weights["steal"] = length(subtypesof(/datum/objective_item/steal))
download_objective.gen_amount_goal() weights["download"] = !(locate(/datum/objective/download) in T.objectives || (T.owner.assigned_role in list("Research Director", "Scientist", "Roboticist")))
T.add_objective(download_objective) switch(pickweight(weights))
else if(prob(70)) // cum. not counting download: 40%. if("sabo")
var/datum/objective/steal/steal_objective = new var/datum/objective/sabotage/sabotage_objective = new
steal_objective.owner = T.owner sabotage_objective.owner = T.owner
steal_objective.find_target() sabotage_objective.find_target()
T.add_objective(steal_objective) T.add_objective(sabotage_objective)
else if("steal")
var/datum/objective/sabotage/sabotage_objective = new var/datum/objective/steal/steal_objective = new
sabotage_objective.owner = T.owner steal_objective.owner = T.owner
sabotage_objective.find_target() steal_objective.find_target()
T.add_objective(sabotage_objective) T.add_objective(steal_objective)
if("download")
var/datum/objective/download/download_objective = new
download_objective.owner = T.owner
download_objective.gen_amount_goal()
T.add_objective(download_objective)