diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index e6a56890c63..277cfa59406 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -367,7 +367,6 @@ var/global/datum/controller/gameticker/ticker if(player.mind.assigned_role == "Captain") captainless=0 if(player.mind.assigned_role != "MODE") - EquipRacialItems(player) job_master.EquipRank(player, player.mind.assigned_role, 0) EquipCustomItems(player) if(captainless) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 6ccb27d2c2b..57e4452ef21 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -184,6 +184,9 @@ wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/spellbook(wizard_mob), slot_r_hand) 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." wizard_mob << "In your pockets you will find a teleport scroll. Use it as needed." diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 829c464bd28..0305c2f29de 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -249,7 +249,7 @@ datum/preferences dat += "
" dat += "Species: [species]
" if(species == "Vox")//oldvox code, sucks I know - dat += "Old Vox? [speciesprefs ? "Yes (Large N2 tank)" : "No(Vox-special N2 tank)"]
" + dat += "N2 Tank: [speciesprefs ? "Large N2 Tank" : "Specialized N2 Tank)"]
" dat += "Secondary Language:
[language]
" dat += "Blood Type: [b_type]
" if(species == "Human") diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm index 7a1045d988a..aadaa9a5da3 100644 --- a/code/modules/customitems/item_spawning.dm +++ b/code/modules/customitems/item_spawning.dm @@ -1,22 +1,3 @@ -/proc/EquipRacialItems(mob/living/carbon/human/M) - if(M.species.name == "Vox" || M.species.name == "Vox Armalis") - M.equip_to_slot_or_del(new /obj/item/clothing/mask/breath(M), slot_wear_mask) - if(M.client.prefs.speciesprefs)//Diseasel, here you go - M.equip_to_slot_or_del(new /obj/item/weapon/tank/nitrogen(M), slot_l_hand) - else - M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/vox(M), slot_l_hand) - M << "\blue You are now running on nitrogen internals from your [M.l_hand]. Your species finds oxygen toxic, so you must breathe nitrogen only." - M.internal = M.l_hand - if (M.internals) - M.internals.icon_state = "internal1" - - //M.generate_name() - - if( M.species.name=="Tajaran" || M.species.name=="Unathi" ) - if(M.mind.assigned_role == "Cyborg" || M.mind.assigned_role == "Clown") - return //Cyborgs don't wear shoes. Clown shoes are large. - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) - /proc/EquipCustomItems(mob/living/carbon/human/M) // testing("\[CustomItem\] Checking for custom items for [M.ckey] ([M.real_name])...") if(!establish_db_connection()) diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index 5c36ba41bbd..65b8060899d 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -29,7 +29,7 @@ // Unequip existing suits and hats. H.unEquip(H.wear_suit) H.unEquip(H.head) - if(H.mind.assigned_role!="Clown") + if(H.mind.assigned_role != "Clown") H.unEquip(H.wear_mask) H.equip_or_collect(new /obj/item/clothing/mask/breath(H), slot_wear_mask) @@ -108,7 +108,7 @@ H.equip_or_collect(new suit(H), slot_wear_suit) H.equip_or_collect(new helm(H), slot_head) H.equip_or_collect(new/obj/item/weapon/tank/plasma/plasmaman(H), tank_slot) // Bigger plasma tank from Raggy. - H << "\blue You are now running on plasma internals from the [H.s_store] in your [tank_slot_name]. You must breathe plasma in order to survive, and are extremely flammable." + H << "You are now running on plasma internals from the [H.s_store] in your [tank_slot_name]. You must breathe plasma in order to survive, and are extremely flammable." H.internal = H.get_item_by_slot(tank_slot) if (H.internals) H.internals.icon_state = "internal1" diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 1604c5baea4..d9f1eccf821 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -58,8 +58,12 @@ base_color = "#066000" /datum/species/unathi/handle_death(var/mob/living/carbon/human/H) - H.stop_tail_wagging(1) + +/datum/species/unathi/equip(var/mob/living/carbon/human/H) + if(H.mind.assigned_role != "Clown") + H.unEquip(H.shoes) + H.equip_or_collect(new /obj/item/clothing/shoes/sandal(H), slot_shoes) /datum/species/tajaran name = "Tajaran" @@ -100,8 +104,12 @@ base_color = "#333333" /datum/species/tajaran/handle_death(var/mob/living/carbon/human/H) - H.stop_tail_wagging(1) + +/datum/species/tajaran/equip(var/mob/living/carbon/human/H) + if(H.mind.assigned_role != "Clown") + H.unEquip(H.shoes) + H.equip_or_collect(new /obj/item/clothing/shoes/sandal(H), slot_shoes) /datum/species/vulpkanin name = "Vulpkanin" @@ -132,7 +140,6 @@ base_color = "#BE8264" /datum/species/vulpkanin/handle_death(var/mob/living/carbon/human/H) - H.stop_tail_wagging(1) /datum/species/skrell @@ -203,23 +210,38 @@ reagent_tag = PROCESS_ORG - makeName(var/gender,var/mob/living/carbon/human/H=null) - var/sounds = rand(2,8) - var/i = 0 - var/newname = "" +/datum/species/vox/makeName(var/gender,var/mob/living/carbon/human/H=null) + var/sounds = rand(2,8) + var/i = 0 + var/newname = "" - while(i<=sounds) - i++ - newname += pick(vox_name_syllables) - return capitalize(newname) + while(i<=sounds) + i++ + newname += pick(vox_name_syllables) + return capitalize(newname) + +/datum/species/vox/equip(var/mob/living/carbon/human/H) + if(H.mind.assigned_role != "Clown") + H.unEquip(H.wear_mask) + H.unEquip(H.l_hand) + + H.equip_or_collect(new /obj/item/clothing/mask/breath/vox(H), slot_wear_mask) + var/tank_pref = H.client.prefs.speciesprefs + if(tank_pref)//Diseasel, here you go + H.equip_or_collect(new /obj/item/weapon/tank/nitrogen(H), slot_l_hand) + else + H.equip_or_collect(new /obj/item/weapon/tank/emergency_oxygen/vox(H), slot_l_hand) + H << "You are now running on nitrogen internals from the [H.l_hand] in your hand. Your species finds oxygen toxic, so you must breathe nitrogen only." + H.internal = H.l_hand + if (H.internals) + H.internals.icon_state = "internal1" + /* /datum/species/vox/handle_post_spawn(var/mob/living/carbon/human/H) - H.verbs += /mob/living/carbon/human/proc/leap ..() */ /datum/species/vox/armalis/handle_post_spawn(var/mob/living/carbon/human/H) - H.verbs += /mob/living/carbon/human/proc/gut ..() diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index b0764bf89ce..3830c9b2705 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -269,7 +269,6 @@ job_master.AssignRole(src, rank, 1) var/mob/living/character = create_character() //creates the human and transfers vars and mind - EquipRacialItems(character) character = job_master.EquipRank(character, rank, 1) //equips the human EquipCustomItems(character)