Skip to content

Commit

Permalink
Removes a bunch of intel stuff, fixes PROC_REFs
Browse files Browse the repository at this point in the history
  • Loading branch information
morrowwolf committed Oct 11, 2023
1 parent db05559 commit baaf06c
Show file tree
Hide file tree
Showing 48 changed files with 15 additions and 2,245 deletions.
6 changes: 0 additions & 6 deletions code/_globalvars/lists/mapping_globals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@ GLOBAL_LIST_EMPTY(nightmare_landmarks)

GLOBAL_LIST_EMPTY(ship_areas)

// Objective landmarks. Value is TRUE if it contains documents
GLOBAL_LIST_EMPTY_TYPED(objective_landmarks_close, /obj/effect/landmark/objective_landmark/close)
GLOBAL_LIST_EMPTY_TYPED(objective_landmarks_medium, /obj/effect/landmark/objective_landmark/medium)
GLOBAL_LIST_EMPTY_TYPED(objective_landmarks_far, /obj/effect/landmark/objective_landmark/far)
GLOBAL_LIST_EMPTY_TYPED(objective_landmarks_science, /obj/effect/landmark/objective_landmark/science)

GLOBAL_LIST_EMPTY(comm_tower_landmarks_net_one)
GLOBAL_LIST_EMPTY(comm_tower_landmarks_net_two)

Expand Down
2 changes: 2 additions & 0 deletions code/controllers/subsystem/objectives_controller.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*
#define CORPSES_TO_SPAWN 25
SUBSYSTEM_DEF(objectives)
Expand Down Expand Up @@ -372,3 +373,4 @@ SUBSYSTEM_DEF(objectives)
/datum/controller/subsystem/objectives/proc/stop_processing_objective(datum/cm_objective/O)
processing_objectives -= O
*/
32 changes: 0 additions & 32 deletions code/datums/mind.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,10 @@
//put this here for easier tracking ingame
var/datum/money_account/initial_account

// List of objectives you have knowledge about
var/datum/objective_memory_storage/objective_memory
var/datum/objective_memory_interface/objective_interface
var/datum/research_objective_memory_interface/research_objective_interface

/datum/mind/New(key, ckey)
src.key = key
src.ckey = ckey
player_entity = setup_player_entity(ckey)
objective_memory = new()
objective_interface = new()
research_objective_interface = new()

/datum/mind/Destroy()
QDEL_NULL(objective_memory)
QDEL_NULL(objective_interface)
QDEL_NULL(research_objective_interface)
return ..()

/datum/mind/proc/transfer_to(mob/living/new_character, force = FALSE)
if(QDELETED(new_character))
Expand Down Expand Up @@ -131,21 +117,3 @@
. = 1 //successfully created a new mind
if(!mind.name) mind.name = real_name
mind.current = src

//this is an objective that the player has just completed
//and we want to store the objective clues generated based on it -spookydonut
/datum/mind/proc/store_objective(datum/cm_objective/O)
if(objective_memory)
objective_memory.store_objective(O)

/datum/mind/proc/view_objective_memories(mob/recipient)
if(!objective_memory)
return

objective_memory.synchronize_objectives()

objective_interface.holder = GET_TREE(TREE_MARINE)
objective_interface.tgui_interact(current)

/datum/mind/proc/view_research_objective_memories(mob/recipient)
research_objective_interface.tgui_interact(current)
2 changes: 0 additions & 2 deletions code/game/gamemodes/cm_initialize.dm
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,6 @@ Additional game mode variables.
H.mind.memory += temp_story
//remove ourselves, so we don't get stuff generated for us
survivors -= H.mind
new /datum/cm_objective/move_mob/almayer/survivor(H)

/datum/game_mode/proc/survivor_non_event_transform(mob/living/carbon/human/H, obj/effect/landmark/spawn_point, is_synth = FALSE, is_CO = FALSE)
H.forceMove(get_turf(spawn_point))
Expand All @@ -816,7 +815,6 @@ Additional game mode variables.

//Give them some information
if(!H.first_xeno) //Only give objectives/back-stories to uninfected survivors
new /datum/cm_objective/move_mob/almayer/survivor(H)
spawn(4)
to_chat(H, "<h2>You are a survivor!</h2>")
to_chat(H, SPAN_NOTICE(SSmapping.configs[GROUND_MAP].survivor_message))
Expand Down
18 changes: 2 additions & 16 deletions code/game/gamemodes/colonialmarines/ai/colonialmarines_ai.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
/datum/game_mode/colonialmarines/ai/pre_setup()
// game_shuttle = SSshuttle.getShuttle(game_shuttle_id)

RegisterSignal(SSdcs, COMSIG_GLOB_XENO_SPAWN, .proc/handle_xeno_spawn)
RegisterSignal(SSdcs, COMSIG_GLOB_XENO_SPAWN, PROC_REF(handle_xeno_spawn))
/* for(var/i in RoleAuthority.squads.Copy())
var/datum/squad/S = i
if(!(S.name in squad_limit))
Expand Down Expand Up @@ -405,21 +405,7 @@
return

//if(!length(GLOB.alive_client_human_list))
// round_finished = MODE_PVE_LOSE

GLOBAL_LIST_EMPTY_TYPED(objective_landmarks, /obj/effect/landmark/objective_landmark)

/obj/effect/landmark/objective_landmark
name = "Objective Landmark"
icon_state = "landmark_node"

/obj/effect/landmark/objective_landmark/Initialize(mapload, ...)
. = ..()
GLOB.objective_landmarks += src

/obj/effect/landmark/objective_landmark/Destroy()
GLOB.objective_landmarks -= src
return ..()
// round_finished = MODE_PVE_LOSEs

/*GLOBAL_LIST_EMPTY_TYPED(boss_entrance_landmarks, /obj/effect/landmark/boss_entrance)
Expand Down
1 change: 0 additions & 1 deletion code/game/jobs/job/civilians/other/survivors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@

if(picked_spawner.story_text)
story_text = picked_spawner.story_text
new /datum/cm_objective/move_mob/almayer/survivor(H)

/datum/job/civilian/survivor/generate_entry_message(mob/living/carbon/human/H)
if(intro_text)
Expand Down
6 changes: 3 additions & 3 deletions code/game/machinery/telecomms/presets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
playsound(src, 'sound/machines/tcomms_on.ogg', vol = 80, vary = FALSE, sound_range = 16, falloff = 0.5)
msg_admin_niche("Portable communication relay started for Z-Level [src.z] [ADMIN_JMP(src)]")

if(SSobjectives && SSobjectives.comms)
//if(SSobjectives && SSobjectives.comms)
// This is the first time colony comms have been established.
if (SSobjectives.comms.state != OBJECTIVE_COMPLETE && is_ground_level(loc.z) && operable())
SSobjectives.comms.complete()
// if (SSobjectives.comms.state != OBJECTIVE_COMPLETE && is_ground_level(loc.z) && operable())
// SSobjectives.comms.complete()

/obj/structure/machinery/telecomms/relay/preset/tower/tcomms_shutdown()
. = ..()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_xo, list(
list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Large Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Medical Pouch", 0, /obj/item/storage/pouch/medical, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Shotgun Shell Pouch", 0, /obj/item/storage/pouch/shotgun, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer, list(
list("POUCHES (CHOOSE 2)", 0, null, null, null),
list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
Expand Down
1 change: 0 additions & 1 deletion code/game/machinery/vending/vendor_types/crew/synthetic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list(
list("POUCHES (CHOOSE 2)", 0, null, null, null),
list("Autoinjector Pouch", 0, /obj/item/storage/pouch/autoinjector, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Construction Pouch", 0, /obj/item/storage/pouch/construction, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Document Pouch", 0, /obj/item/storage/pouch/document, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("Electronics Pouch (Full)", 0, /obj/item/storage/pouch/electronics/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
Expand Down
179 changes: 0 additions & 179 deletions code/game/machinery/vending/vendor_types/intelligence_officer.dm

This file was deleted.

Loading

0 comments on commit baaf06c

Please sign in to comment.