mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 06:27:26 +01:00
Merge pull request #435 from ZomgPonies/fixuns
Various fixings and additions
This commit is contained in:
Mark van Alphen
@@ -1,18 +1,15 @@
|
||||
/mob/living/carbon/verb/give()
|
||||
/mob/living/carbon/verb/give(var/mob/living/carbon/target in oview(1))
|
||||
set category = "IC"
|
||||
set name = "Give"
|
||||
set src in view(1)
|
||||
if(src.stat == 2 || usr.stat == 2 || src.client == null)
|
||||
return
|
||||
if(src == usr)
|
||||
usr << "\red I feel stupider, suddenly."
|
||||
|
||||
if(target.stat == 2 || usr.stat == 2|| target.client == null)
|
||||
return
|
||||
var/obj/item/I
|
||||
if(!usr.hand && usr.r_hand == null)
|
||||
usr << "\red You don't have anything in your right hand to give to [src.name]"
|
||||
usr << "<span class='warning'> You don't have anything in your right hand to give to [target.name]</span>"
|
||||
return
|
||||
if(usr.hand && usr.l_hand == null)
|
||||
usr << "\red You don't have anything in your left hand to give to [src.name]"
|
||||
usr << "<span class='warning'> You don't have anything in your left hand to give to [target.name]</span>"
|
||||
return
|
||||
if(usr.hand)
|
||||
I = usr.l_hand
|
||||
@@ -23,38 +20,38 @@
|
||||
if((I.flags & NODROP) || (I.flags & ABSTRACT))
|
||||
usr << "<span class='notice'>That's not exactly something you can give.</span>"
|
||||
return
|
||||
if(src.r_hand == null || src.l_hand == null)
|
||||
switch(alert(src,"[usr] wants to give you \a [I]?",,"Yes","No"))
|
||||
if(target.r_hand == null || target.l_hand == null)
|
||||
switch(alert(target,"[usr] wants to give you \a [I]?",,"Yes","No"))
|
||||
if("Yes")
|
||||
if(!I)
|
||||
return
|
||||
if(!Adjacent(usr))
|
||||
usr << "\red You need to stay in reaching distance while giving an object."
|
||||
src << "\red [usr.name] moved too far away."
|
||||
usr << "<span class='warning'> You need to stay in reaching distance while giving an object.</span>"
|
||||
target << "<span class='warning'> [usr.name] moved too far away.</span>"
|
||||
return
|
||||
if((usr.hand && usr.l_hand != I) || (!usr.hand && usr.r_hand != I))
|
||||
usr << "\red You need to keep the item in your active hand."
|
||||
src << "\red [usr.name] seem to have given up on giving \the [I.name] to you."
|
||||
usr << "<span class='warning'> You need to keep the item in your active hand.</span>"
|
||||
target << "<span class='warning'> [usr.name] seem to have given up on giving \the [I.name] to you.</span>"
|
||||
return
|
||||
if(src.r_hand != null && src.l_hand != null)
|
||||
src << "\red Your hands are full."
|
||||
usr << "\red Their hands are full."
|
||||
if(target.r_hand != null && target.l_hand != null)
|
||||
target << "<span class='warning'> Your hands are full.</span>"
|
||||
usr << "<span class='warning'> Their hands are full.</span>"
|
||||
return
|
||||
else
|
||||
usr.drop_item()
|
||||
if(src.r_hand == null)
|
||||
src.r_hand = I
|
||||
if(target.r_hand == null)
|
||||
target.r_hand = I
|
||||
else
|
||||
src.l_hand = I
|
||||
I.loc = src
|
||||
target.l_hand = I
|
||||
I.loc = target
|
||||
I.layer = 20
|
||||
I.add_fingerprint(src)
|
||||
I.add_fingerprint(target)
|
||||
src.update_inv_l_hand()
|
||||
src.update_inv_r_hand()
|
||||
usr.update_inv_l_hand()
|
||||
usr.update_inv_r_hand()
|
||||
src.visible_message("\blue [usr.name] handed \the [I.name] to [src.name].")
|
||||
target.visible_message("<span class='notice'> [usr.name] handed \the [I.name] to [target.name].</span>")
|
||||
if("No")
|
||||
src.visible_message("\red [usr.name] tried to hand [I.name] to [src.name] but [src.name] didn't want it.")
|
||||
target.visible_message("<span class='warning'> [usr.name] tried to hand [I.name] to [target.name] but [target.name] didn't want it.</span>")
|
||||
else
|
||||
usr << "\red [src.name]'s hands are full."
|
||||
usr << "<span class='warning'> [target.name]'s hands are full.</span>"
|
||||
@@ -466,7 +466,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
|
||||
if(species.name=="Plasmaman")
|
||||
|
||||
// Check if we're wearing our biosuit and mask.
|
||||
if (!istype(wear_suit,/obj/item/clothing/suit/space/plasmaman) || !istype(head,/obj/item/clothing/head/helmet/space/plasmaman))
|
||||
if (!istype(wear_suit,/obj/item/clothing/suit/space/eva/plasmaman) || !istype(head,/obj/item/clothing/head/helmet/space/eva/plasmaman))
|
||||
//testing("Plasmaman [src] leakin'. coverflags=[cover_flags]")
|
||||
// OH FUCK HE LEAKIN'.
|
||||
// This was OP.
|
||||
|
||||
@@ -30,26 +30,48 @@
|
||||
H.unEquip(H.wear_mask)
|
||||
|
||||
H.equip_or_collect(new /obj/item/clothing/mask/breath(H), slot_wear_mask)
|
||||
var/suit=/obj/item/clothing/suit/space/plasmaman
|
||||
var/helm=/obj/item/clothing/head/helmet/space/plasmaman
|
||||
var/suit=/obj/item/clothing/suit/space/eva/plasmaman
|
||||
var/helm=/obj/item/clothing/head/helmet/space/eva/plasmaman
|
||||
var/tank_slot = slot_s_store
|
||||
var/tank_slot_name = "suit storage"
|
||||
|
||||
switch(H.mind.assigned_role)
|
||||
/*
|
||||
if("Research Director","Scientist","Geneticist","Roboticist")
|
||||
suit=/obj/item/clothing/suit/space/vox/casual/science
|
||||
helm=/obj/item/clothing/head/helmet/space/vox/casual/science
|
||||
if("Chief Engineer","Station Engineer","Atmospheric Technician")
|
||||
suit=/obj/item/clothing/suit/space/vox/casual/engineer
|
||||
helm=/obj/item/clothing/head/helmet/space/vox/casual/engineer
|
||||
suit=/obj/item/clothing/suit/space/eva/plasmaman/science
|
||||
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/science
|
||||
if("Chief Engineer","Station Engineer")
|
||||
suit=/obj/item/clothing/suit/space/eva/plasmaman/engineer
|
||||
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/engineer
|
||||
if("Atmospheric Technician")
|
||||
suit=/obj/item/clothing/suit/space/eva/plasmaman/atmostech
|
||||
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/atmostech
|
||||
if("Head of Security","Warden","Detective","Security Officer")
|
||||
suit=/obj/item/clothing/suit/space/vox/casual/security
|
||||
helm=/obj/item/clothing/head/helmet/space/vox/casual/security
|
||||
suit=/obj/item/clothing/suit/space/eva/plasmaman/security
|
||||
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/security
|
||||
if("Chief Medical Officer","Medical Doctor","Paramedic","Chemist")
|
||||
suit=/obj/item/clothing/suit/space/vox/casual/medical
|
||||
helm=/obj/item/clothing/head/helmet/space/vox/casual/medical
|
||||
*/ // For now.
|
||||
suit=/obj/item/clothing/suit/space/eva/plasmaman/medical
|
||||
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/medical
|
||||
if("Bartender", "Chef")
|
||||
suit=/obj/item/clothing/suit/space/eva/plasmaman/service
|
||||
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/service
|
||||
if("Cargo Technician", "Quartermaster")
|
||||
suit=/obj/item/clothing/suit/space/eva/plasmaman/cargo
|
||||
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/cargo
|
||||
if("Shaft Miner")
|
||||
suit=/obj/item/clothing/suit/space/eva/plasmaman/miner
|
||||
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/miner
|
||||
if("Botanist")
|
||||
suit=/obj/item/clothing/suit/space/eva/plasmaman/botanist
|
||||
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/botanist
|
||||
if("Chaplain")
|
||||
suit=/obj/item/clothing/suit/space/eva/plasmaman/chaplain
|
||||
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/chaplain
|
||||
if("Janitor")
|
||||
suit=/obj/item/clothing/suit/space/eva/plasmaman/janitor
|
||||
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/janitor
|
||||
if("Assistant")
|
||||
suit=/obj/item/clothing/suit/space/eva/plasmaman/assistant
|
||||
helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/assistant
|
||||
if("Clown","Mime")
|
||||
tank_slot=slot_r_hand
|
||||
tank_slot_name = "hand"
|
||||
|
||||
@@ -598,6 +598,32 @@
|
||||
icon_state = "vox_shortquills"
|
||||
species_allowed = list("Vox")
|
||||
|
||||
vox_crestedquills
|
||||
name = "Crested Vox Quills"
|
||||
icon_state = "vox_crestedquills"
|
||||
species_allowed = list("Vox")
|
||||
|
||||
vox_tielquills
|
||||
name = "Vox Tiel Quills"
|
||||
icon_state = "vox_tielquills"
|
||||
species_allowed = list("Vox")
|
||||
|
||||
vox_emperorquills
|
||||
name = "Vox Emperor Quills"
|
||||
icon_state = "vox_emperorquills"
|
||||
species_allowed = list("Vox")
|
||||
|
||||
vox_keelquills
|
||||
name = "Vox Keel Quills"
|
||||
icon_state = "vox_keelquills"
|
||||
species_allowed = list("Vox")
|
||||
|
||||
vox_keetquills
|
||||
name = "Vox Keet Quills"
|
||||
icon_state = "vox_keetquills"
|
||||
species_allowed = list("Vox")
|
||||
|
||||
|
||||
/datum/sprite_accessory/facial_hair
|
||||
|
||||
taj_sideburns
|
||||
|
||||
Reference in New Issue
Block a user