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

Merge pull request #9716 from Ghommie/Ghommie-cit317

Browse Source 
Porting objective code refactor (ergo fixing abductors/abductees objective by updating the code)
This commit is contained in:
kevinz000
2019-11-10 11:27:04 -07:00
committed by GitHub
parent 7b0eac15e9 8c31c1036d
commit 1493863533
46 changed files with 399 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/cryopod.dm
+5 -7
View File
@@ -370,16 +370,14 @@
O.find_target()
O.update_explanation_text()
if(!(O.target))
O.owner.objectives -= O
qdel(O)
if(mob_occupant.mind && mob_occupant.mind.assigned_role)
if(mob_occupant.mind)
//Handle job slot/tater cleanup.
var/job = mob_occupant.mind.assigned_role
SSjob.FreeRole(job)
if(mob_occupant.mind.objectives.len)
mob_occupant.mind.objectives.Cut()
mob_occupant.mind.special_role = null
if(mob_occupant.mind.assigned_role)
var/job = mob_occupant.mind.assigned_role
SSjob.FreeRole(job)
mob_occupant.mind.special_role = null
// Delete them from datacore.