mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-27 14:06:43 +01:00
Did some more custom PDA adjustments and fixed the g44 stuff.
This commit is contained in:
@@ -87,7 +87,7 @@
|
||||
new /obj/item/weapon/gun/energy/gun/fluff/dominator(src)
|
||||
new /obj/item/clothing/suit/armor/det_suit(src)
|
||||
new /obj/item/fluff/permit/joanrisu(src)
|
||||
new /obj/item/clothing/accessory/storage/black_vest(src)
|
||||
new /obj/item/dnalockingchip(src)
|
||||
new /obj/item/weapon/sword/fluff/joanaria(src)
|
||||
new /obj/item/weapon/flame/lighter/zippo/fluff/joan(src)
|
||||
new /obj/item/clothing/under/rank/internalaffairs/fluff/joan(src)
|
||||
|
||||
@@ -300,7 +300,7 @@
|
||||
/obj/item/weapon/gun/projectile/automatic/carbine/fluff/g44/update_icon(var/ignore_inhands)
|
||||
..()
|
||||
if(istype(ammo_magazine,/obj/item/ammo_magazine/a556m))
|
||||
icon_state = "bullpupm"
|
||||
icon_state = "g44"
|
||||
else
|
||||
icon_state = (ammo_magazine)? "g44" : "g44-empty"
|
||||
item_state = (ammo_magazine)? "bullpup" : "bullpup-empty"
|
||||
@@ -308,7 +308,7 @@
|
||||
|
||||
//-----------------------G44 Energy Variant--------------------
|
||||
|
||||
/obj/item/weapon/gun/energy/gun/burst
|
||||
/obj/item/weapon/gun/energy/gun/burst/g44e
|
||||
name = "G44 Energy Rifle"
|
||||
desc = "The G44 Energy is a laser variant of the G44 lightweight assault rifle manufactured by the National Armory of Gaia. Though almost exclusively to the United Federation's Military Assault Command Operations Department (MACOs) and Starfleet, it is occassionally sold to security departments for their stun capabilities."
|
||||
icon = 'icons/vore/custom_guns_vr.dmi'
|
||||
|
||||
@@ -146,13 +146,13 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie
|
||||
user.visible_message("<span class='warning'>[user] invades [M]'s personal space, thrusting [src] into their face insistently.</span>","<span class='warning'>You invade [M]'s personal space, thrusting [src] into their face insistently.</span>")
|
||||
|
||||
//JoanRisu:Joan Risu
|
||||
/obj/item/device/pda/heads/hos/fluff/joanpda
|
||||
icon_override = 'icons/vore/custom_items_vr.dmi'
|
||||
/obj/item/device/pda/heads/hos/joanpda
|
||||
icon = 'icons/vore/custom_items_vr.dmi'
|
||||
icon_state = "pda-joan"
|
||||
|
||||
//Vorrarkul:Lucina Dakarim
|
||||
/obj/item/device/pda/heads/cmo/fluff/lucinapda
|
||||
icon_override = 'icons/vore/custom_items_vr.dmi'
|
||||
/obj/item/device/pda/heads/cmo/lucinapda
|
||||
icon = 'icons/vore/custom_items_vr.dmi'
|
||||
icon_state = "pda-lucina"
|
||||
|
||||
//john.wayne9392:Harmony Prechtl
|
||||
|
||||
Reference in New Issue
Block a user