From 942f0e309e6f8a97e98479b056190706ab350d51 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sat, 12 Mar 2016 20:29:10 -0600 Subject: [PATCH 1/2] Plasamen fixes --- code/game/gamemodes/shadowling/special_shadowling_abilities.dm | 3 +-- code/modules/admin/verbs/one_click_antag.dm | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm index 1ab065b706b..ad264b54ac5 100644 --- a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm @@ -26,7 +26,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N for(var/obj/item/I in H) //drops all items H.unEquip(I) - + H.status_flags |= GODMODE //Can't die while hatching sleep(50) var/turf/simulated/floor/F var/turf/shadowturf = get_turf(user) @@ -36,7 +36,6 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N qdel(R) new /obj/structure/alien/weeds/node(shadowturf) //Dim lighting in the chrysalis -- removes itself afterwards var/temp_flags = H.status_flags - H.status_flags |= GODMODE //Can't die while hatching H.visible_message("A chrysalis forms around [H], sealing them inside.", \ "You create your chrysalis and begin to contort within.") diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 3ea77f65259..8caa9080894 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -320,6 +320,7 @@ missionobj.explanation_text = mission missionobj.completed = 1 Commando.mind.objectives += missionobj + Commando.set_species(/datum/species/human) //Greet the commando Commando << "You are the [numagents==1?"Deathsquad Officer":"Death Commando"]." @@ -410,6 +411,7 @@ missionobj.explanation_text = mission missionobj.completed = 1 newmob.mind.objectives += missionobj + newmob.set_species(/datum/species/human) //Greet the official newmob << "You are a Centcom Official." @@ -507,6 +509,7 @@ missionobj.explanation_text = mission missionobj.completed = 1 ERTOperative.mind.objectives += missionobj + ERTOperative.set_species(/datum/species/human) //Greet the commando ERTOperative << "You are [numagents==1?"the Emergency Response Team Commander":"an Emergency Response Officer"]." From da8baeaab8d7c750d041e3c375e8c071fefd55a8 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Tue, 15 Mar 2016 12:29:35 -0500 Subject: [PATCH 2/2] Human fixes --- code/modules/admin/verbs/one_click_antag.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 8caa9080894..fdf936ae8f2 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -320,7 +320,6 @@ missionobj.explanation_text = mission missionobj.completed = 1 Commando.mind.objectives += missionobj - Commando.set_species(/datum/species/human) //Greet the commando Commando << "You are the [numagents==1?"Deathsquad Officer":"Death Commando"]." @@ -333,7 +332,7 @@ Commando << missiondesc if(config.enforce_human_authority) - Commando.set_species("human") + Commando.set_species(/datum/species/human) //Logging and cleanup if(numagents == 1) @@ -411,7 +410,9 @@ missionobj.explanation_text = mission missionobj.completed = 1 newmob.mind.objectives += missionobj - newmob.set_species(/datum/species/human) + + if(config.enforce_human_authority) + newmob.set_species(/datum/species/human) //Greet the official newmob << "You are a Centcom Official." @@ -509,7 +510,6 @@ missionobj.explanation_text = mission missionobj.completed = 1 ERTOperative.mind.objectives += missionobj - ERTOperative.set_species(/datum/species/human) //Greet the commando ERTOperative << "You are [numagents==1?"the Emergency Response Team Commander":"an Emergency Response Officer"]." @@ -522,7 +522,7 @@ ERTOperative << missiondesc if(config.enforce_human_authority) - ERTOperative.set_species("human") + ERTOperative.set_species(/datum/species/human) //Logging and cleanup if(numagents == 1)