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

Possibly fix #5958

Browse Source
This commit is contained in:
Rob Nelson
2015-10-04 18:51:09 -07:00
parent 3ebabfface
commit b24d319cdd
3 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/datums/mind.dm
View File

@@ -152,7 +152,6 @@
var/text = ""
if (istype(current, /mob/living/carbon/human) || istype(current, /mob/living/carbon/monkey) || istype(current, /mob/living/simple_animal/construct))
/mob/living/simple_animal/borer
/** HAS BORER **/
text = "Has Borer"
text = "<i><b>[text]</b></i>: "

3
code/modules/recruiter.dm → code/datums/recruiter.dm
View File

@@ -15,14 +15,13 @@
// player = /mob/dead/observer
// controls = /string
var/event/player_volunteering = new()
// Same, but only called when player has disabled the role.
var/event/player_not_volunteering = new()
// Args: player = /mob/dead/observer or null
var/event/recruited = new()
//poll="Someone is harvesting [display_name]. Would you like to play as one?"
/datum/recruiter/proc/recruiting_player(var/mob/dead/observer/O)
INVOKE_EVENT(player_volunteering, list("player"=O, "controls"="<a href='?src=\ref[O];jump=\ref[host]'>Teleport</a> | <a href='?src=\ref[src];signup=\ref[O]'>Retract</a>"))

30
code/modules/mob/living/simple_animal/borer.dm
View File

@@ -1,19 +1,3 @@
/*
var/global/list/borer_attached_verbs = list(
///client/proc/borer_bond_brain,
/client/proc/borer_borer_speak,
// /client/proc/borer_kill_host,
// /client/proc/borer_damage_brain,
/client/proc/borer_secrete_chemicals,
/client/proc/borer_abandon_host,
/client/proc/borer_evolve
)
var/global/list/borer_detached_verbs = list(
/client/proc/borer_infest,
/client/proc/borer_ventcrawl,
/client/proc/borer_hide,
)
*/
var/global/borer_chem_types = typesof(/datum/borer_chem) - /datum/borer_chem
var/global/borer_unlock_types = typesof(/datum/unlockable/borer) - /datum/unlockable/borer - /datum/unlockable/borer/chem_unlock - /datum/unlockable/borer/verb_unlock
@@ -90,10 +74,6 @@ var/global/borer_unlock_types = typesof(/datum/unlockable/borer) - /datum/unlock
if(U.id!="")
borer_avail_unlocks.Add(U)
// Test variant.
/mob/living/simple_animal/borer/test/New(var/loc)
..(loc,1)
/mob/living/simple_animal/borer/Life()
if(timestopped) return 0 //under effects of time magick
@@ -764,7 +744,7 @@ mob/living/simple_animal/borer/proc/detach()
src.mind.assigned_role = "Cortical Borer"
// Assign objectives
forge_objectives()
//forge_objectives()
// tl;dr
src << "<span class='danger'>You are a Cortical Borer!</span>"
@@ -774,10 +754,10 @@ mob/living/simple_animal/borer/proc/detach()
if(config.borer_takeover_immediately)
src << "<span class='info'><b>Important:</b> While you receive full control at the start, <em>it is asked that you release control at some point so your host has a chance to play.</em> If they misbehave, you are permitted to kill them.</span>"
var/obj_count = 1
for(var/datum/objective/objective in mind.objectives)
src << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
obj_count++
//var/obj_count = 1
//for(var/datum/objective/objective in mind.objectives)
// src << "<B>Objective #[obj_count]</B>: [objective.explanation_text]"
// obj_count++
/mob/living/simple_animal/borer/proc/forge_objectives()
//writepanic("[__FILE__].[__LINE__] ([src.type])([usr ? usr.ckey : ""]) \\mob/living/simple_animal/borer/proc/forge_objectives() called tick#: [world.time]")