From e5e9013ab4a918b4706edc340e44628d5a6cff30 Mon Sep 17 00:00:00 2001 From: PJB3005 Date: Wed, 24 Sep 2014 15:15:56 +0200 Subject: [PATCH 1/2] make bananium smeltable exactly as the title says, though, the smelter menu calls it 'clown', because the oretag is clown, didn't fix it, because i dont know what things use the oretag variable(i know some), and didn't want to break anything over such a small bug --- code/modules/mining/ore_datum.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mining/ore_datum.dm b/code/modules/mining/ore_datum.dm index 239629ca824..9927b6e5b85 100644 --- a/code/modules/mining/ore_datum.dm +++ b/code/modules/mining/ore_datum.dm @@ -49,3 +49,7 @@ smelts_to = /obj/item/stack/sheet/mineral/tritium compresses_to = /obj/item/stack/sheet/mineral/mhydrogen oretag = "hydrogen" + +/datum/ore/clown + smelts_to = /obj/item/stack/sheet/mineral/clown + oretag = "clown" \ No newline at end of file From 58a76e75348fb2ccac13d864af10d2c58faade40 Mon Sep 17 00:00:00 2001 From: PJB3005 Date: Wed, 24 Sep 2014 17:23:26 +0200 Subject: [PATCH 2/2] RCSses can send crates simple copy paste of the code for closets --- .../structures/crates_lockers/crates.dm | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index e1f53edc1e9..2bcf45b4c16 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -68,6 +68,68 @@ return 1 /obj/structure/closet/crate/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W, /obj/item/weapon/rcs) && !src.opened) + var/obj/item/weapon/rcs/E = W + if(E.rcharges != 0) + if(E.mode == 0) + if(!E.teleporting) + var/list/L = list() + var/list/areaindex = list() + for(var/obj/machinery/telepad_cargo/R in world) + if(R.stage == 0) + var/turf/T = get_turf(R) + var/tmpname = T.loc.name + if(areaindex[tmpname]) + tmpname = "[tmpname] ([++areaindex[tmpname]])" + else + areaindex[tmpname] = 1 + L[tmpname] = R + var/desc = input("Please select a telepad.", "RCS") in L + E.pad = L[desc] + playsound(E.loc, 'sound/machines/click.ogg', 50, 1) + user << "\blue Teleporting [src.name]..." + E.teleporting = 1 + sleep(50) + E.teleporting = 0 + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(5, 1, src) + s.start() + do_teleport(src, E.pad, 0) + E.rcharges-- + if(E.rcharges != 1) + user << "\blue Teleport successful. [E.rcharges] charges left." + E.desc = "Use this to send crates and closets to cargo telepads. There are [E.rcharges] charges left." + return + else + user << "\blue Teleport successful. [E.rcharges] charge left." + E.desc = "Use this to send crates and closets to cargo telepads. There is [E.rcharges] charge left." + return + else + E.rand_x = rand(50,200) + E.rand_y = rand(50,200) + var/L = locate(E.rand_x, E.rand_y, 6) + playsound(E.loc, 'sound/machines/click.ogg', 50, 1) + user << "\blue Teleporting [src.name]..." + E.teleporting = 1 + sleep(50) + E.teleporting = 0 + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(5, 1, src) + s.start() + do_teleport(src, L) + E.rcharges-- + if(E.rcharges != 1) + user << "\blue Teleport successful. [E.rcharges] charges left." + E.desc = "Use this to send crates and closets to cargo telepads. There are [E.rcharges] charges left." + return + else + user << "\blue Teleport successful. [E.rcharges] charge left." + E.desc = "Use this to send crates and closets to cargo telepads. There is [E.rcharges] charge left." + return + else + user << "\red Out of charges." + return + if(opened) if(isrobot(user)) return