diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index 57e4452ef21..7924fcd1bf3 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -185,7 +185,6 @@
wizard_mob.faction = list("wizard")
- // For Vox and plasmadudes.
wizard_mob.species.equip(wizard_mob)
wizard_mob << "You will find a list of available spells in your spell book. Choose your magic arsenal carefully."
diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm
index 8064542ede8..ae1e053659b 100644
--- a/code/modules/admin/verbs/onlyone.dm
+++ b/code/modules/admin/verbs/onlyone.dm
@@ -3,20 +3,20 @@
alert("The game hasn't started yet!")
return
+ var/list/incompatible_species = list("Plasmaman")
for(var/mob/living/carbon/human/H in player_list)
- if(H.stat == 2 || !(H.client)) continue
- if(is_special_character(H)) continue
+ if(H.stat == DEAD || !(H.client))
+ continue
+ if(is_special_character(H))
+ continue
+ if(H.species.name in incompatible_species)
+ H.set_species("Human")
+ var/datum/preferences/A = new() // Randomize appearance
+ A.copy_to(H)
ticker.mode.traitors += H.mind
H.mind.special_role = "traitor"
- /* This never worked.
- var/datum/objective/steal/steal_objective = new
- steal_objective.owner = H.mind
- steal_objective.set_target("nuclear authentication disk")
- H.mind.objectives += steal_objective
- */
-
var/datum/objective/hijack/hijack_objective = new
hijack_objective.owner = H.mind
H.mind.objectives += hijack_objective
@@ -37,7 +37,7 @@
H.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(H), slot_w_uniform)
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear)
H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), slot_head)
- H.equip_to_slot_or_del(new /obj/item/weapon/claymore(H), slot_l_hand)
+ H.equip_to_slot_or_del(new /obj/item/weapon/claymore(H), slot_r_hand)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(H), slot_shoes)
H.equip_to_slot_or_del(new /obj/item/weapon/pinpointer(H.loc), slot_l_store)
@@ -49,8 +49,9 @@
W.assignment = "Highlander"
W.registered_name = H.real_name
H.equip_to_slot_or_del(W, slot_wear_id)
+ H.species.equip(H)
H.regenerate_icons()
- message_admins("\blue [key_name_admin(usr)] used THERE CAN BE ONLY ONE! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
+ message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ONE! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
+ log_admin("[key_name(usr)] used there can be only one.")
nologevent = 1
- log_admin("[key_name(usr)] used there can be only one.")
\ No newline at end of file
diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm
index 2d53fef466b..6f175985548 100644
--- a/code/modules/admin/verbs/onlyoneteam.dm
+++ b/code/modules/admin/verbs/onlyoneteam.dm
@@ -2,15 +2,17 @@
if(!ticker)
alert("The game hasn't started yet!")
return
-
+
+ var/list/incompatible_species = list("Plasmaman")
for(var/mob/living/carbon/human/H in player_list)
- if(H.stat == 2 || !(H.client)) continue
- if(is_special_character(H)) continue
-
-
-
-// ticker.mode.traitors += H.mind
-
+ if(H.stat == DEAD || !(H.client))
+ continue
+ if(is_special_character(H))
+ continue
+ if(H.species.name in incompatible_species)
+ H.set_species("Human")
+ var/datum/preferences/A = new() // Randomize appearance
+ A.copy_to(H)
for (var/obj/item/I in H)
if (istype(I, /obj/item/weapon/implant))
@@ -22,17 +24,13 @@
H << "You are part of the [station_name()] dodgeball tournament. Throw dodgeballs at crewmembers wearing a different color than you. OOC: Use THROW on an EMPTY-HAND to catch thrown dodgeballs."
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear)
-// H.equip_to_slot_or_del(new /obj/item/clothing/head/beret(H), slot_head)
- H.equip_to_slot_or_del(new /obj/item/weapon/beach_ball/dodgeball(H), slot_l_hand)
+ H.equip_to_slot_or_del(new /obj/item/weapon/beach_ball/dodgeball(H), slot_r_hand)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
-
-
if(prob(50))
team_alpha += H
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/red/dodgeball(H), slot_w_uniform)
-
var/obj/item/weapon/card/id/W = new(H)
W.name = "[H.real_name]'s ID Card"
W.icon_state = "centcom"
@@ -41,13 +39,11 @@
W.assignment = "Professional Pee-Wee League Dodgeball Player"
W.registered_name = H.real_name
H.equip_to_slot_or_del(W, slot_wear_id)
- H.regenerate_icons()
else
team_bravo += H
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/blue/dodgeball(H), slot_w_uniform)
-
var/obj/item/weapon/card/id/W = new(H)
W.name = "[H.real_name]'s ID Card"
W.icon_state = "centcom"
@@ -56,10 +52,13 @@
W.assignment = "Professional Pee-Wee League Dodgeball Player"
W.registered_name = H.real_name
H.equip_to_slot_or_del(W, slot_wear_id)
- H.regenerate_icons()
- message_admins("\blue [key_name_admin(usr)] used DODGEBAWWWWWWWL! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
- nologevent = 1
+
+ H.species.equip(H)
+ H.regenerate_icons()
+
+ message_admins("[key_name_admin(usr)] used DODGEBAWWWWWWWL! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1)
log_admin("[key_name(usr)] used dodgeball.")
+ nologevent = 1
/obj/item/weapon/beach_ball/dodgeball
name = "dodgeball"
@@ -76,16 +75,16 @@
if(H.l_hand == src) return
var/mob/A = H.LAssailant
if((H in team_alpha) && (A in team_alpha))
- A << "\red He's on your team!"
+ A << "He's on your team!"
return
else if((H in team_bravo) && (A in team_bravo))
- A << "\red He's on your team!"
+ A << "He's on your team!"
return
else if(!A in team_alpha && !A in team_bravo)
- A << "\red You're not part of the dodgeball game, sorry!"
+ A << "You're not part of the dodgeball game, sorry!"
return
else
playsound(src, 'sound/items/dodgeball.ogg', 50, 1)
- visible_message("\red [H] HAS BEEN ELIMINATED!", 3)
+ visible_message("[H] HAS BEEN ELIMINATED!", 3)
H.melt()
- return
\ No newline at end of file
+ return