mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-03 06:01:46 +00:00
cac628a640
New variables: var/use_to_pickup = if 1, the storage item also works like satchels, which means you can use it on something else to pick it up. var/display_contents_with_number = if 1, the items in the storage item are grouped by type with the number of items being displayed. See the screenshot. var/allow_quick_empty = if 1 on creation, it adds a verb that allows you to empty the item with one click var/allow_quick_gather = if 1 on creation, it adds a verb which allows you to switch between pick-up methods. one-per-click or all-on-tile. Same as satchels worked. use_to_pickup must be 1 for any of that to matter. var/collection_mode = 1; //0 = pick one at a time, 1 = pick all on tile New procs: /obj/item/weapon/storage/proc/can_be_inserted(obj/item/W as obj, stop_messages = 0) - Returns 0 or 1, depending on whether the item W can be inserted /obj/item/weapon/storage/proc/handle_item_insertion(obj/item/W as obj) - Inserts the item into the storage item and calls all the procs it needs to. Doesn't check whether the item can fit tho, tha'ts what can_be_inserted() is for. /obj/item/weapon/storage/proc/remove_from_storage(obj/item/W as obj, atom/new_location) - Removes item W from the storage object and sets it's loc to new_location or get_turf(src) if one is not provided. /obj/item/proc/on_exit_storage(obj/item/weapon/storage/S as obj) - Called after the object has been removed from the storage item S. The object's loc is already set to the new one. /obj/item/proc/on_enter_storage(obj/item/weapon/storage/S as obj) - Called after the object has been inserted into the storage item S. The object's loc is already set to S. I made satchels work on this new code. The rest will be added to it soon. See the screenshot. Screenshot: http://www.kamletos.si/new%20satchels.png This is yet another big change and it is very possible that bugs will come from it. Please report them to me or on the tracker. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4451 316c924e-a436-60f5-8080-3fe189b3f50e
272 lines
6.1 KiB
Plaintext
272 lines
6.1 KiB
Plaintext
/**********************Mineral ores**************************/
|
|
|
|
/obj/item/weapon/ore
|
|
name = "Rock"
|
|
icon = 'icons/obj/mining.dmi'
|
|
icon_state = "ore"
|
|
|
|
|
|
/obj/item/weapon/ore/uranium
|
|
name = "Uranium ore"
|
|
icon_state = "Uranium ore"
|
|
origin_tech = "materials=5"
|
|
|
|
/obj/item/weapon/ore/iron
|
|
name = "Iron ore"
|
|
icon_state = "Iron ore"
|
|
origin_tech = "materials=1"
|
|
|
|
/obj/item/weapon/ore/glass
|
|
name = "Sand"
|
|
icon_state = "Glass ore"
|
|
origin_tech = "materials=1"
|
|
|
|
attack_self(mob/living/user as mob) //It's magic I ain't gonna explain how instant conversion with no tool works. -- Urist
|
|
var/location = get_turf(user)
|
|
for(var/obj/item/weapon/ore/glass/sandToConvert in location)
|
|
new /obj/item/stack/sheet/sandstone(location)
|
|
del(sandToConvert)
|
|
new /obj/item/stack/sheet/sandstone(location)
|
|
del(src)
|
|
|
|
/obj/item/weapon/ore/plasma
|
|
name = "Plasma ore"
|
|
icon_state = "Plasma ore"
|
|
origin_tech = "materials=2"
|
|
|
|
/obj/item/weapon/ore/silver
|
|
name = "Silver ore"
|
|
icon_state = "Silver ore"
|
|
origin_tech = "materials=3"
|
|
|
|
/obj/item/weapon/ore/gold
|
|
name = "Gold ore"
|
|
icon_state = "Gold ore"
|
|
origin_tech = "materials=4"
|
|
|
|
/obj/item/weapon/ore/diamond
|
|
name = "Diamond ore"
|
|
icon_state = "Diamond ore"
|
|
origin_tech = "materials=6"
|
|
|
|
/obj/item/weapon/ore/clown
|
|
name = "Bananium ore"
|
|
icon_state = "Clown ore"
|
|
origin_tech = "materials=4"
|
|
|
|
/obj/item/weapon/ore/slag
|
|
name = "Slag"
|
|
desc = "Completely useless"
|
|
icon_state = "slag"
|
|
|
|
/obj/item/weapon/ore/New()
|
|
pixel_x = rand(0,16)-8
|
|
pixel_y = rand(0,8)-8
|
|
|
|
|
|
/*****************************Coin********************************/
|
|
|
|
/obj/item/weapon/coin
|
|
icon = 'icons/obj/items.dmi'
|
|
name = "Coin"
|
|
icon_state = "coin"
|
|
flags = FPRINT | TABLEPASS| CONDUCT
|
|
force = 0.0
|
|
throwforce = 0.0
|
|
w_class = 1.0
|
|
var/string_attached
|
|
|
|
/obj/item/weapon/coin/New()
|
|
pixel_x = rand(0,16)-8
|
|
pixel_y = rand(0,8)-8
|
|
|
|
/obj/item/weapon/coin/gold
|
|
name = "Gold coin"
|
|
icon_state = "coin_gold"
|
|
|
|
/obj/item/weapon/coin/silver
|
|
name = "Silver coin"
|
|
icon_state = "coin_silver"
|
|
|
|
/obj/item/weapon/coin/diamond
|
|
name = "Diamond coin"
|
|
icon_state = "coin_diamond"
|
|
|
|
/obj/item/weapon/coin/iron
|
|
name = "Iron coin"
|
|
icon_state = "coin_iron"
|
|
|
|
/obj/item/weapon/coin/plasma
|
|
name = "Solid plasma coin"
|
|
icon_state = "coin_plasma"
|
|
|
|
/obj/item/weapon/coin/uranium
|
|
name = "Uranium coin"
|
|
icon_state = "coin_uranium"
|
|
|
|
/obj/item/weapon/coin/clown
|
|
name = "Bananaium coin"
|
|
icon_state = "coin_clown"
|
|
|
|
/obj/item/weapon/coin/adamantine
|
|
name = "Adamantine coin"
|
|
icon_state = "coin_adamantine"
|
|
|
|
/obj/item/weapon/coin/mythril
|
|
name = "Mythril coin"
|
|
icon_state = "coin_mythril"
|
|
|
|
/obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
|
if(istype(W,/obj/item/weapon/cable_coil) )
|
|
var/obj/item/weapon/cable_coil/CC = W
|
|
if(string_attached)
|
|
user << "\blue There already is a string attached to this coin."
|
|
return
|
|
|
|
if(CC.amount <= 0)
|
|
user << "\blue This cable coil appears to be empty."
|
|
del(CC)
|
|
return
|
|
|
|
overlays += image('icons/obj/items.dmi',"coin_string_overlay")
|
|
string_attached = 1
|
|
user << "\blue You attach a string to the coin."
|
|
CC.use(1)
|
|
else if(istype(W,/obj/item/weapon/wirecutters) )
|
|
if(!string_attached)
|
|
..()
|
|
return
|
|
|
|
var/obj/item/weapon/cable_coil/CC = new/obj/item/weapon/cable_coil(user.loc)
|
|
CC.amount = 1
|
|
CC.updateicon()
|
|
overlays = list()
|
|
string_attached = null
|
|
user << "\blue You detach the string from the coin."
|
|
else ..()
|
|
|
|
/******************************Materials****************************/
|
|
|
|
/obj/item/stack/sheet/gold
|
|
name = "gold"
|
|
icon_state = "sheet-gold"
|
|
force = 5.0
|
|
throwforce = 5
|
|
w_class = 3.0
|
|
throw_speed = 3
|
|
throw_range = 3
|
|
origin_tech = "materials=4"
|
|
perunit = 2000
|
|
|
|
/obj/item/stack/sheet/gold/New(loc,amount)
|
|
..()
|
|
pixel_x = rand(0,4)-4
|
|
pixel_y = rand(0,4)-4
|
|
/* recipes = gold_recipes //Commenting out until there's a proper sprite. The golden plaque is supposed to be a special item dedicated to a really good player. -Agouri
|
|
|
|
var/global/list/datum/stack_recipe/gold_recipes = list ( \
|
|
new/datum/stack_recipe("Plaque", /obj/item/weapon/plaque_assembly, 2), \
|
|
)*/
|
|
|
|
|
|
/obj/item/stack/sheet/silver
|
|
name = "silver"
|
|
icon_state = "sheet-silver"
|
|
force = 5.0
|
|
throwforce = 5
|
|
w_class = 3.0
|
|
throw_speed = 3
|
|
throw_range = 3
|
|
origin_tech = "materials=3"
|
|
perunit = 2000
|
|
|
|
/obj/item/stack/sheet/silver/New(loc,amount)
|
|
..()
|
|
pixel_x = rand(0,4)-4
|
|
pixel_y = rand(0,4)-4
|
|
|
|
/obj/item/stack/sheet/diamond
|
|
name = "diamond"
|
|
icon_state = "sheet-diamond"
|
|
force = 5.0
|
|
throwforce = 5
|
|
w_class = 3.0
|
|
throw_range = 3
|
|
origin_tech = "materials=6"
|
|
perunit = 3750
|
|
|
|
/obj/item/stack/sheet/diamond/New(loc,amount)
|
|
..()
|
|
pixel_x = rand(0,4)-4
|
|
pixel_y = rand(0,4)-4
|
|
|
|
/obj/item/stack/sheet/uranium
|
|
name = "uranium"
|
|
icon_state = "sheet-uranium"
|
|
force = 5.0
|
|
throwforce = 5
|
|
w_class = 3.0
|
|
throw_speed = 3
|
|
throw_range = 3
|
|
origin_tech = "materials=5"
|
|
perunit = 2000
|
|
|
|
/obj/item/stack/sheet/enruranium
|
|
name = "enriched uranium"
|
|
icon_state = "sheet-enruranium"
|
|
force = 5.0
|
|
throwforce = 5
|
|
w_class = 3.0
|
|
throw_speed = 3
|
|
throw_range = 3
|
|
origin_tech = "materials=5"
|
|
perunit = 1000
|
|
|
|
/obj/item/stack/sheet/plasma
|
|
name = "solid plasma"
|
|
icon_state = "sheet-plasma"
|
|
force = 5.0
|
|
throwforce = 5
|
|
w_class = 3.0
|
|
throw_speed = 3
|
|
throw_range = 3
|
|
origin_tech = "plasmatech=2;materials=2"
|
|
perunit = 2000
|
|
|
|
/obj/item/stack/sheet/adamantine
|
|
name = "adamantine"
|
|
icon_state = "sheet-adamantine"
|
|
force = 5.0
|
|
throwforce = 5
|
|
w_class = 3.0
|
|
throw_speed = 3
|
|
throw_range = 3
|
|
origin_tech = "materials=4"
|
|
perunit = 2000
|
|
|
|
/obj/item/stack/sheet/mythril
|
|
name = "mythril"
|
|
icon_state = "sheet-mythril"
|
|
force = 5.0
|
|
throwforce = 5
|
|
w_class = 3.0
|
|
throw_speed = 3
|
|
throw_range = 3
|
|
origin_tech = "materials=4"
|
|
perunit = 2000
|
|
|
|
/obj/item/stack/sheet/clown
|
|
name = "bananium"
|
|
icon_state = "sheet-clown"
|
|
force = 5.0
|
|
throwforce = 5
|
|
w_class = 3.0
|
|
throw_speed = 3
|
|
throw_range = 3
|
|
origin_tech = "materials=4"
|
|
perunit = 2000
|
|
|
|
/obj/item/stack/sheet/clown/New(loc,amount)
|
|
..()
|
|
pixel_x = rand(0,4)-4
|
|
pixel_y = rand(0,4)-4 |