mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-27 18:51:53 +00:00
595f24bd1b
This commit removes code/defines/obj.dm and code/defines/obj/weapon.dm. These files were only kept for legacy compatibility and do not fit into the tree system at all. It doesn't even make sense since the base defines are all that were in these, the actual code for the items was in the right file. Any new ports that use this file on a different codebase should be sorted into the tree system anyways, new files if necessary. A giant defines file is just wasting space and searching effort.
136 lines
3.1 KiB
Plaintext
136 lines
3.1 KiB
Plaintext
//MISC WEAPONS
|
|
|
|
//This file contains /obj/item/weapon's that do not fit in any other category and are not big enough to warrant individual files.
|
|
/*CURRENT CONTENTS
|
|
Ball Toy
|
|
Cane
|
|
Cardboard Tube
|
|
Fan
|
|
Gaming Kit
|
|
Gift
|
|
Kidan Globe
|
|
Lightning
|
|
Newton Cradle
|
|
PAI cable
|
|
Red Phone
|
|
*/
|
|
|
|
/obj/item/weapon/balltoy
|
|
name = "ball toy"
|
|
icon = 'icons/obj/decorations.dmi'
|
|
icon_state = "rollball"
|
|
desc = "A device bored paper pushers use to remind themselves that the time did not stop yet."
|
|
|
|
/obj/item/weapon/cane
|
|
name = "cane"
|
|
desc = "A cane used by a true gentlemen. Or a clown."
|
|
icon = 'icons/obj/weapons.dmi'
|
|
icon_state = "cane"
|
|
item_state = "stick"
|
|
flags = CONDUCT
|
|
force = 5.0
|
|
throwforce = 7.0
|
|
w_class = 2.0
|
|
m_amt = 50
|
|
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
|
|
|
|
/obj/item/weapon/c_tube
|
|
name = "cardboard tube"
|
|
desc = "A tube... of cardboard."
|
|
icon = 'icons/obj/items.dmi'
|
|
icon_state = "c_tube"
|
|
throwforce = 1
|
|
w_class = 1.0
|
|
throw_speed = 4
|
|
throw_range = 5
|
|
|
|
|
|
|
|
/obj/item/weapon/fan
|
|
name = "desk fan"
|
|
icon = 'icons/obj/decorations.dmi'
|
|
icon_state = "fan"
|
|
desc = "A smal desktop fan. Button seems to be stuck in the 'on' position."
|
|
|
|
/*
|
|
/obj/item/weapon/game_kit
|
|
name = "Gaming Kit"
|
|
icon = 'icons/obj/items.dmi'
|
|
icon_state = "game_kit"
|
|
var/selected = null
|
|
var/board_stat = null
|
|
var/data = ""
|
|
var/base_url = "http://svn.slurm.us/public/spacestation13/misc/game_kit"
|
|
item_state = "sheet-metal"
|
|
w_class = 5.0
|
|
*/
|
|
|
|
/obj/item/weapon/gift
|
|
name = "gift"
|
|
desc = "A wrapped item."
|
|
icon = 'icons/obj/items.dmi'
|
|
icon_state = "gift3"
|
|
var/size = 3.0
|
|
var/obj/item/gift = null
|
|
item_state = "gift"
|
|
w_class = 4.0
|
|
|
|
/obj/item/weapon/kidanglobe
|
|
name = "Kidan homeworld globe"
|
|
icon = 'icons/obj/decorations.dmi'
|
|
icon_state = "kidanglobe"
|
|
desc = "A globe of the Kidan homeworld."
|
|
|
|
/obj/item/weapon/lightning
|
|
name = "lightning"
|
|
icon = 'icons/obj/lightning.dmi'
|
|
icon_state = "lightning"
|
|
desc = "test lightning"
|
|
|
|
New()
|
|
icon = midicon
|
|
icon_state = "1"
|
|
|
|
afterattack(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, flag, params)
|
|
var/angle = get_angle(A, user)
|
|
//world << angle
|
|
angle = round(angle) + 45
|
|
if(angle > 180)
|
|
angle -= 180
|
|
else
|
|
angle += 180
|
|
|
|
if(!angle)
|
|
angle = 1
|
|
//world << "adjusted [angle]"
|
|
icon_state = "[angle]"
|
|
//world << "[angle] [(get_dist(user, A) - 1)]"
|
|
user.Beam(A, "lightning", 'icons/obj/zap.dmi', 50, 15)
|
|
|
|
/obj/item/weapon/newton
|
|
name = "newton cradle"
|
|
icon = 'icons/obj/decorations.dmi'
|
|
icon_state = "newton"
|
|
desc = "A device bored paper pushers use to remind themselves that the time did not stop yet. Contains gravity."
|
|
|
|
/obj/item/weapon/pai_cable
|
|
desc = "A flexible coated cable with a universal jack on one end."
|
|
name = "data cable"
|
|
icon = 'icons/obj/power.dmi'
|
|
icon_state = "wire1"
|
|
|
|
var/obj/machinery/machine
|
|
|
|
/obj/item/weapon/phone
|
|
name = "red phone"
|
|
desc = "Should anything ever go wrong..."
|
|
icon = 'icons/obj/items.dmi'
|
|
icon_state = "red_phone"
|
|
flags = CONDUCT
|
|
force = 3.0
|
|
throwforce = 2.0
|
|
throw_speed = 1
|
|
throw_range = 4
|
|
w_class = 2
|
|
attack_verb = list("called", "rang")
|
|
hitsound = 'sound/weapons/ring.ogg' |