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

Committing for Intigracy: Adds new Steal objectives, and allows admins to assign a new objective type.

Browse Source 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5327 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
d_h2005@yahoo.com
2012-12-15 07:22:50 +00:00
parent 7d44e54f01
commit 48c0e5626f
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/datums/mind.dm
View File

@@ -361,7 +361,7 @@ datum/mind
if(!def_value)//If it's a custom objective, it will be an empty string.
def_value = "custom"
var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "debrain", "protect", "hijack", "escape", "survive", "steal", "download", "nuclear", "capture", "absorb", "custom")
var/new_obj_type = input("Select objective type:", "Objective type", def_value) as null|anything in list("assassinate", "debrain", "protect", "prevent", "hijack", "escape", "survive", "steal", "download", "nuclear", "capture", "absorb", "custom")
if (!new_obj_type) return
var/datum/objective/new_objective = null
@@ -399,6 +399,10 @@ datum/mind
//Will display as special role if the target is set as MODE. Ninjas/commandos/nuke ops.
new_objective.explanation_text = "[objective_type] [new_target:real_name], the [new_target:mind:assigned_role=="MODE" ? (new_target:mind:special_role) : (new_target:mind:assigned_role)]."
if ("prevent")
new_objective = new /datum/objective/block
new_objective.owner = src
if ("hijack")
new_objective = new /datum/objective/hijack
new_objective.owner = src

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

@@ -171,7 +171,7 @@ datum/objective/hijack
datum/objective/block
explanation_text = "Do not allow any humans to escape on the shuttle alive."
explanation_text = "Do not allow any organic lifeforms to escape on the shuttle alive."
check_completion()
@@ -278,10 +278,19 @@ datum/objective/steal
"the station blueprints" = /obj/item/blueprints,
"a nasa voidsuit" = /obj/item/clothing/suit/space/nasavoid,
"28 moles of plasma (full tank)" = /obj/item/weapon/tank,
"a slime core" = /obj/item/slime_core,
"a piece of corgi meat" = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi,
"a research directors jumpsuit" = /obj/item/clothing/under/rank/research_director,
"a chief engineers jumpsuit" = /obj/item/clothing/under/rank/chief_engineer,
"a chief medical officers jumpsuit" = /obj/item/clothing/under/rank/chief_medical_officer,
"a head of securitys jumpsuit" = /obj/item/clothing/under/rank/head_of_security,
"the hypospray" = /obj/item/weapon/reagent_containers/hypospray,
"the captains pinpointer" = /obj/item/weapon/pinpointer,
"an ablative armor vest" = /obj/item/clothing/suit/armor/laserproof,
)
var/global/possible_items_special[] = list(
"nuclear authentication disk" = /obj/item/weapon/disk/nuclear,
/*"nuclear authentication disk" = /obj/item/weapon/disk/nuclear,*///Broken with the change to nuke disk making it respawn on z level change.
"nuclear gun" = /obj/item/weapon/gun/energy/gun/nuclear,
"diamond drill" = /obj/item/weapon/pickaxe/diamonddrill,
"bag of holding" = /obj/item/weapon/storage/backpack/holding,