mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 07:33:34 +01:00
Reduce lines by removing blank lines added by PJ's script
This commit is contained in:
Tigercat2000
@@ -65,34 +65,28 @@
|
||||
/obj/structure/closet/crate/secure/loot/togglelock(mob/user as mob)
|
||||
if(locked)
|
||||
to_chat(user, "<span class='notice'>The crate is locked with a Deca-code lock.</span>")
|
||||
|
||||
var/input = input(usr, "Enter digit from [min] to [max].", "Deca-Code Lock", "") as num
|
||||
if(in_range(src, user))
|
||||
input = Clamp(input, 0, 10)
|
||||
if (input == code)
|
||||
to_chat(user, "<span class='notice'>The crate unlocks!</span>")
|
||||
|
||||
locked = 0
|
||||
overlays.Cut()
|
||||
overlays += greenlight
|
||||
else if (input == null || input > max || input < min)
|
||||
to_chat(user, "<span class='notice'>You leave the crate alone.</span>")
|
||||
|
||||
else
|
||||
to_chat(user, "<span class='warning'>A red light flashes.</span>")
|
||||
|
||||
lastattempt = input
|
||||
attempts--
|
||||
if (attempts == 0)
|
||||
to_chat(user, "<span class='danger'>The crate's anti-tamper system activates!</span>")
|
||||
|
||||
var/turf/T = get_turf(src.loc)
|
||||
explosion(T, -1, -1, 1, 1)
|
||||
qdel(src)
|
||||
return
|
||||
else
|
||||
to_chat(user, "<span class='notice'>You attempt to interact with the device using a hand gesture, but it appears this crate is from before the DECANECT came out.</span>")
|
||||
|
||||
return
|
||||
else
|
||||
return ..()
|
||||
@@ -101,27 +95,20 @@
|
||||
if(locked)
|
||||
if (istype(W, /obj/item/weapon/card/emag))
|
||||
to_chat(user, "<span class='notice'>The crate unlocks!</span>")
|
||||
|
||||
locked = 0
|
||||
if (istype(W, /obj/item/device/multitool))
|
||||
to_chat(user, "<span class='notice'>DECA-CODE LOCK REPORT:</span>")
|
||||
|
||||
if (attempts == 1)
|
||||
to_chat(user, "<span class='warning'>* Anti-Tamper Bomb will activate on next failed access attempt.</span>")
|
||||
|
||||
else
|
||||
to_chat(user, "<span class='notice'>* Anti-Tamper Bomb will activate after [src.attempts] failed access attempts.</span>")
|
||||
|
||||
if (lastattempt == null)
|
||||
to_chat(user, "<span class='notice'> has been made to open the crate thus far.</span>")
|
||||
|
||||
return
|
||||
// hot and cold
|
||||
if (code > lastattempt)
|
||||
to_chat(user, "<span class='notice'>* Last access attempt lower than expected code.</span>")
|
||||
|
||||
else
|
||||
to_chat(user, "<span class='notice'>* Last access attempt higher than expected code.</span>")
|
||||
|
||||
else ..()
|
||||
else ..()
|
||||
|
||||
@@ -103,17 +103,14 @@
|
||||
var/obj/item/stack/cable_coil/CC = W
|
||||
if(string_attached)
|
||||
to_chat(user, "<span class='notice'>There already is a string attached to this coin.</span>")
|
||||
|
||||
return
|
||||
|
||||
if (CC.use(1))
|
||||
overlays += image('icons/obj/items.dmi',"coin_string_overlay")
|
||||
string_attached = 1
|
||||
to_chat(user, "<span class='notice'>You attach a string to the coin.</span>")
|
||||
|
||||
else
|
||||
to_chat(user, "<span class='warning'>You need one length of cable to attach a string to the coin.</span>")
|
||||
|
||||
return
|
||||
|
||||
else if(istype(W,/obj/item/weapon/wirecutters))
|
||||
@@ -127,7 +124,6 @@
|
||||
overlays = list()
|
||||
string_attached = null
|
||||
to_chat(user, "<span class='notice'>You detach the string from the coin.</span>")
|
||||
|
||||
else if(istype(W,/obj/item/weapon/weldingtool))
|
||||
var/obj/item/weapon/weldingtool/WT = W
|
||||
if(WT.welding && WT.remove_fuel(0, user))
|
||||
@@ -139,7 +135,6 @@
|
||||
var/typekey = typelist[cmineral]
|
||||
if(ispath(typekey))
|
||||
to_chat(user, "\blue You make [src] into a ring.")
|
||||
|
||||
new typekey(get_turf(loc))
|
||||
qdel(src)
|
||||
else ..()
|
||||
|
||||
@@ -210,7 +210,6 @@
|
||||
points = 0
|
||||
else
|
||||
to_chat(usr, "<span class='warning'>Required access not found.</span>")
|
||||
|
||||
else if(href_list["choice"] == "insert")
|
||||
var/obj/item/weapon/card/id/I = usr.get_active_hand()
|
||||
if(istype(I))
|
||||
@@ -220,7 +219,6 @@
|
||||
inserted_id = I
|
||||
else
|
||||
to_chat(usr, "<span class='warning'>No valid ID.</span>")
|
||||
|
||||
if(href_list["release"])
|
||||
if(check_access(inserted_id) || allowed(usr)) //Check the ID inside, otherwise check the user.
|
||||
if(!(text2path(href_list["release"]) in stack_list)) return
|
||||
@@ -235,7 +233,6 @@
|
||||
stack_list -= text2path(href_list["release"])
|
||||
else
|
||||
to_chat(usr, "<span class='warning'>Required access not found.</span>")
|
||||
|
||||
if(href_list["plasteel"])
|
||||
if(check_access(inserted_id) || allowed(usr))
|
||||
if(!(/obj/item/stack/sheet/metal in stack_list)) return
|
||||
@@ -252,7 +249,6 @@
|
||||
unload_mineral(plasteelout)
|
||||
else
|
||||
to_chat(usr, "<span class='warning'>Required access not found.</span>")
|
||||
|
||||
if(href_list["plasglass"])
|
||||
if(check_access(inserted_id) || allowed(usr))
|
||||
if(!(/obj/item/stack/sheet/glass in stack_list)) return
|
||||
@@ -269,7 +265,6 @@
|
||||
unload_mineral(plasglassout)
|
||||
else
|
||||
to_chat(usr, "<span class='warning'>Required access not found.</span>")
|
||||
|
||||
updateUsrDialog()
|
||||
return
|
||||
|
||||
@@ -422,7 +417,6 @@
|
||||
inserted_id = I
|
||||
else
|
||||
to_chat(usr, "<span class='danger'>No valid ID.</span>")
|
||||
|
||||
if(href_list["purchase"])
|
||||
if(istype(inserted_id))
|
||||
var/datum/data/mining_equipment/prize = locate(href_list["purchase"])
|
||||
@@ -504,18 +498,15 @@
|
||||
var/obj/item/weapon/card/id/C = I
|
||||
C.mining_points += points
|
||||
to_chat(user, "<span class='info'>You transfer [points] points to [C].</span>")
|
||||
|
||||
points = 0
|
||||
else
|
||||
to_chat(user, "<span class='info'>There's no points left on [src].</span>")
|
||||
|
||||
..()
|
||||
|
||||
/obj/item/weapon/card/mining_point_card/examine(mob/user)
|
||||
..(user)
|
||||
to_chat(user, "There's [points] points on the card.")
|
||||
|
||||
|
||||
/**********************Jaunter**********************/
|
||||
|
||||
/obj/item/device/wormhole_jaunter
|
||||
@@ -534,7 +525,6 @@
|
||||
var/turf/device_turf = get_turf(user)
|
||||
if(!device_turf||device_turf.z==2||device_turf.z>=7)
|
||||
to_chat(user, "<span class='notice'>You're having difficulties getting the [src.name] to work.</span>")
|
||||
|
||||
return
|
||||
else
|
||||
user.visible_message("<span class='notice'>[user.name] activates the [src.name]!</span>")
|
||||
@@ -545,7 +535,6 @@
|
||||
L += B
|
||||
if(!L.len)
|
||||
to_chat(user, "<span class='notice'>The [src.name] failed to create a wormhole.</span>")
|
||||
|
||||
return
|
||||
var/chosen_beacon = pick(L)
|
||||
var/obj/effect/portal/wormhole/jaunt_tunnel/J = new /obj/effect/portal/wormhole/jaunt_tunnel(get_turf(src), chosen_beacon)
|
||||
@@ -617,12 +606,10 @@
|
||||
if(burst_time == 50)
|
||||
burst_time = 30
|
||||
to_chat(user, "<span class='info'>You set the resonator's fields to detonate after 3 seconds.</span>")
|
||||
|
||||
else
|
||||
burst_time = 50
|
||||
to_chat(user, "<span class='info'>You set the resonator's fields to detonate after 5 seconds.</span>")
|
||||
|
||||
|
||||
/obj/item/weapon/resonator/afterattack(atom/target, mob/user, proximity_flag)
|
||||
if(proximity_flag)
|
||||
if(!check_allowed_items(target, 1)) return
|
||||
@@ -659,12 +646,10 @@
|
||||
for(var/mob/living/L in src.loc)
|
||||
add_logs(L, creator, "used a resonator field on", object="resonator")
|
||||
to_chat(L, "<span class='danger'>The [src.name] ruptured with you in it!</span>")
|
||||
|
||||
L.adjustBruteLoss(resonance_damage)
|
||||
else
|
||||
for(var/mob/living/L in src.loc)
|
||||
to_chat(L, "<span class='danger'>The [src.name] ruptured with you in it!</span>")
|
||||
|
||||
L.adjustBruteLoss(resonance_damage)
|
||||
qdel(src)
|
||||
|
||||
@@ -741,19 +726,15 @@
|
||||
if(W.welding && !stat)
|
||||
if(stance != HOSTILE_STANCE_IDLE)
|
||||
to_chat(user, "<span class='info'>[src] is moving around too much to repair!</span>")
|
||||
|
||||
return
|
||||
if(maxHealth == health)
|
||||
to_chat(user, "<span class='info'>[src] is at full integrity.</span>")
|
||||
|
||||
else
|
||||
health += 10
|
||||
to_chat(user, "<span class='info'>You repair some of the armor on [src].</span>")
|
||||
|
||||
return
|
||||
if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner))
|
||||
to_chat(user, "<span class='info'>You instruct [src] to drop any collected ore.</span>")
|
||||
|
||||
DropOre()
|
||||
return
|
||||
..()
|
||||
@@ -776,11 +757,9 @@
|
||||
if(0)
|
||||
SetCollectBehavior()
|
||||
to_chat(M, "<span class='info'>[src] has been set to search and store loose ore.</span>")
|
||||
|
||||
if(2)
|
||||
SetOffenseBehavior()
|
||||
to_chat(M, "<span class='info'>[src] has been set to attack hostile wildlife.</span>")
|
||||
|
||||
return
|
||||
..()
|
||||
|
||||
@@ -888,11 +867,9 @@
|
||||
return
|
||||
else
|
||||
to_chat(user, "<span class='info'>[src] is only effective on the dead.</span>")
|
||||
|
||||
return
|
||||
else
|
||||
to_chat(user, "<span class='info'>[src] is only effective on lesser beings.</span>")
|
||||
|
||||
return
|
||||
|
||||
/obj/item/weapon/lazarus_injector/emag_act()
|
||||
@@ -907,11 +884,9 @@
|
||||
..(user)
|
||||
if(!loaded)
|
||||
to_chat(user, "<span class='info'>[src] is empty.</span>")
|
||||
|
||||
if(malfunctioning)
|
||||
to_chat(user, "<span class='info'>The display on [src] seems to be flickering.</span>")
|
||||
|
||||
|
||||
/**********************Mining Scanner**********************/
|
||||
|
||||
/obj/item/device/mining_scanner
|
||||
@@ -1017,9 +992,7 @@
|
||||
var/obj/item/organ/internal/hivelord_core/C = M
|
||||
if(!istype(C, /obj/item/organ/internal/hivelord_core))
|
||||
to_chat(user, "<span class='warning'>The stabilizer only works on hivelord cores.</span>")
|
||||
|
||||
return ..()
|
||||
C.preserved = 1
|
||||
to_chat(user, "<span class='notice'>You inject the hivelord core with the stabilizer. It will no longer go inert.</span>")
|
||||
|
||||
qdel(src)
|
||||
@@ -19,11 +19,9 @@
|
||||
var/obj/docking_port/mobile/M = shuttle_master.getShuttle("laborcamp")
|
||||
if(!M)
|
||||
to_chat(usr, "<span class='warning'>Cannot locate shuttle!</span>")
|
||||
|
||||
return 0
|
||||
var/obj/docking_port/stationary/S = M.get_docked()
|
||||
if(S && S.name == "laborcamp_away")
|
||||
to_chat(usr, "<span class='warning'>Shuttle is already at the outpost!</span>")
|
||||
|
||||
return 0
|
||||
..()
|
||||
@@ -76,7 +76,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
/obj/machinery/mineral/labor_claim_console/Topic(href, href_list)
|
||||
usr.set_machine(src)
|
||||
src.add_fingerprint(usr)
|
||||
@@ -90,7 +89,6 @@
|
||||
inserted_id.points += machine.points
|
||||
machine.points = 0
|
||||
to_chat(src, "Points transferred.")
|
||||
|
||||
else if(href_list["choice"] == "insert")
|
||||
var/obj/item/weapon/card/id/prisoner/I = usr.get_active_hand()
|
||||
if(istype(I))
|
||||
@@ -99,29 +97,23 @@
|
||||
inserted_id = I
|
||||
else
|
||||
to_chat(usr, "<span class='warning'>Invalid ID.</span>")
|
||||
|
||||
if(check_auth()) //Sanity check against hef spoofs
|
||||
if(href_list["choice"] == "station")
|
||||
if(!alone_in_area(get_area(src), usr))
|
||||
to_chat(usr, "<span class='warning'>Prisoners are only allowed to be released while alone.</span>")
|
||||
|
||||
else
|
||||
switch(shuttle_master.moveShuttle("laborcamp","laborcamp_home"))
|
||||
if(1)
|
||||
to_chat(usr, "<span class='notice'>Shuttle not found</span>")
|
||||
|
||||
if(2)
|
||||
to_chat(usr, "<span class='notice'>Shuttle already at station</span>")
|
||||
|
||||
if(3)
|
||||
to_chat(usr, "<span class='notice'>No permission to dock could be granted.</span>")
|
||||
|
||||
else
|
||||
var/message = "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval."
|
||||
announcer.autosay(message, "Labor Camp Controller", "Security")
|
||||
to_chat(usr, "<span class='notice'>Shuttle received message and will be sent shortly.</span>")
|
||||
|
||||
|
||||
if(href_list["choice"] == "release")
|
||||
if(alone_in_area(get_area(loc), usr))
|
||||
var/obj/docking_port/stationary/S = shuttle_master.getDock("laborcamp_home")
|
||||
@@ -130,11 +122,9 @@
|
||||
release_door.open()
|
||||
else
|
||||
to_chat(usr, "<span class='warning'>Prisoners can only be released while docked with the station.</span>")
|
||||
|
||||
else
|
||||
to_chat(usr, "<span class='warning'>Prisoners are only allowed to be released while alone.</span>")
|
||||
|
||||
|
||||
src.updateUsrDialog()
|
||||
return
|
||||
|
||||
@@ -180,15 +170,10 @@
|
||||
if(istype(I, /obj/item/weapon/card/id/prisoner))
|
||||
var/obj/item/weapon/card/id/prisoner/prisoner_id = I
|
||||
to_chat(user, "<span class='notice'><B>ID: [prisoner_id.registered_name]</B></span>")
|
||||
|
||||
to_chat(user, "<span class='notice'>Points Collected:[prisoner_id.points]</span>")
|
||||
|
||||
to_chat(user, "<span class='notice'>Point Quota: [prisoner_id.goal]</span>")
|
||||
|
||||
to_chat(user, "<span class='notice'>Collect points by bringing smelted minerals to the Labor Shuttle stacking machine. Reach your quota to earn your release.</span>")
|
||||
|
||||
else
|
||||
to_chat(user, "<span class='warning'>Error: Invalid ID</span>")
|
||||
|
||||
return
|
||||
..()
|
||||
|
||||
@@ -178,7 +178,6 @@
|
||||
|
||||
if (href_list["download"])
|
||||
to_chat(if(!src.dl_list) usr, "\red This unit is not capable of downloading any additional schematics.")
|
||||
|
||||
else
|
||||
var/amtdl = 0
|
||||
//var/dontload = 0
|
||||
@@ -193,10 +192,8 @@
|
||||
amtdl++
|
||||
else dontload = 0*/
|
||||
to_chat(if (amtdl) usr, "\blue [amtdl] new schematics downloaded from Robotics Research Database.")
|
||||
|
||||
to_chat(else usr, "\red No new schematics currently available in Robotics Research Database.")
|
||||
|
||||
|
||||
if (href_list["delete"])
|
||||
var/operation = text2num(href_list["delete"])
|
||||
if(operation == 1) // Clear Disk Schematics
|
||||
@@ -205,19 +202,15 @@
|
||||
src.diskload-= D
|
||||
amtgone++
|
||||
to_chat(if (amtgone) usr, "\blue Cleared [amtgone] schematics from database.")
|
||||
|
||||
to_chat(else usr, "\red No disk-loaded schematics detected in database.")
|
||||
|
||||
if(operation == 2) // Clear Download Schematics
|
||||
var/amtgone = 0
|
||||
for(var/datum/manufacture/D in src.download)
|
||||
src.download-= D
|
||||
amtgone++
|
||||
to_chat(if (amtgone) usr, "\blue Cleared [amtgone] schematics from database.")
|
||||
|
||||
to_chat(else usr, "\red No downloaded schematics detected in database.")
|
||||
|
||||
|
||||
if (href_list["eject"])
|
||||
var/operation = text2num(href_list["eject"])
|
||||
var/ejectamt = 0
|
||||
@@ -236,7 +229,6 @@
|
||||
if(11) ejecting = /obj/item/weapon/ore/fabric
|
||||
else
|
||||
to_chat(usr, "\red Error. Unknown ore type.")
|
||||
|
||||
return
|
||||
sleep(3)
|
||||
ejectamt = input(usr,"How many units do you want to eject?","Eject Materials") as num
|
||||
@@ -258,7 +250,6 @@
|
||||
if (istype(O,I.cost3)) A3++
|
||||
if (A1 < I.amount1 || A2 < I.amount2 || A3 < I.amount3)
|
||||
to_chat(usr, "\red Insufficient materials to manufacture that item.")
|
||||
|
||||
return
|
||||
// Consume Mats
|
||||
var/C1 = I.amount1
|
||||
@@ -347,7 +338,6 @@
|
||||
load = 2
|
||||
else if(istype(W, /obj/item/weapon/disk/data/schematic))
|
||||
to_chat(if (!src.acceptdisk) user, "\red This unit is unable to accept disks.")
|
||||
|
||||
else
|
||||
var/amtload = 0
|
||||
var/dontload = 0
|
||||
@@ -365,9 +355,7 @@
|
||||
amtload++
|
||||
else dontload = 0
|
||||
to_chat(if (amtload) user, "\blue [amtload] new schematics downloaded from disk.")
|
||||
|
||||
to_chat(else user, "\red No new schematics available on disk.")
|
||||
|
||||
else if (istype(W, /obj/item/weapon/storage/bag/ore))
|
||||
for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] uses the []'s automatic ore loader on []!", user, src, W), 1)
|
||||
var/amtload = 0
|
||||
@@ -375,13 +363,10 @@
|
||||
M.loc = src
|
||||
amtload++
|
||||
to_chat(if (amtload) user, "\blue [amtload] pieces of ore loaded from [W]!")
|
||||
|
||||
to_chat(else user, "\red No ore loaded!")
|
||||
|
||||
else if(istype(W, /obj/item/weapon/card/emag))
|
||||
src.hacked = 1
|
||||
to_chat(user, "\blue You remove the [src]'s product locks!")
|
||||
|
||||
else ..()
|
||||
|
||||
if (load == 1)
|
||||
@@ -407,9 +392,7 @@
|
||||
M.loc = src
|
||||
amtload++
|
||||
to_chat(if (amtload) user, "\blue [amtload] pieces of ore loaded from [O]!")
|
||||
|
||||
to_chat(else user, "\red No ore loaded!")
|
||||
|
||||
else if (istype(O, /obj/item/weapon/ore/))
|
||||
for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] begins quickly stuffing ore into []!", user, src), 1)
|
||||
var/staystill = user.loc
|
||||
@@ -418,7 +401,6 @@
|
||||
sleep(3)
|
||||
if (user.loc != staystill) break
|
||||
to_chat(user, "\blue You finish stuffing ore into [src]!")
|
||||
|
||||
/*else if (istype(O, /obj/item/weapon/plant/wheat/metal))
|
||||
for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] begins quickly stuffing [O] into []!", user, src), 1)
|
||||
var/staystill = user.loc
|
||||
@@ -428,7 +410,6 @@
|
||||
sleep(3)
|
||||
if (user.loc != staystill) break
|
||||
to_chat(user, "\blue You finish stuffing [O] into [src]!"*/)
|
||||
|
||||
else ..()
|
||||
src.updateUsrDialog()
|
||||
|
||||
|
||||
@@ -220,7 +220,6 @@
|
||||
var/mob/living/simple_animal/T = target
|
||||
if(captured)
|
||||
to_chat(U, "<span class='notice'>Capture failed!</span>: The capsule already has a mob registered to it!")
|
||||
|
||||
else
|
||||
if(istype(T) && "neutral" in T.faction)
|
||||
T.forceMove(src)
|
||||
@@ -228,12 +227,10 @@
|
||||
T.cancel_camera()
|
||||
name = "Lazarus Capsule: [initial(T.name)]"
|
||||
to_chat(U, "<span class='notice'>You placed a [T.name] inside the Lazarus Capsule!</span>")
|
||||
|
||||
captured = T
|
||||
else
|
||||
to_chat(U, "You can't capture that mob!")
|
||||
|
||||
|
||||
/obj/item/device/mobcapsule/throw_impact(atom/A, mob/user)
|
||||
..()
|
||||
if(captured)
|
||||
|
||||
@@ -362,7 +362,6 @@ var/global/list/rockTurfEdgeCache
|
||||
|
||||
if (!user.IsAdvancedToolUser())
|
||||
to_chat(usr, "<span class='warning'>You don't have the dexterity to do this!</span>")
|
||||
|
||||
return
|
||||
|
||||
if (istype(P, /obj/item/weapon/pickaxe))
|
||||
@@ -374,13 +373,11 @@ var/global/list/rockTurfEdgeCache
|
||||
return
|
||||
last_act = world.time
|
||||
to_chat(user, "<span class='notice'>You start picking...</span>")
|
||||
|
||||
P.playDigSound()
|
||||
|
||||
if(do_after(user, P.digspeed, target = src))
|
||||
if(istype(src, /turf/simulated/mineral)) //sanity check against turf being deleted during digspeed delay
|
||||
to_chat(user, "<span class='notice'>You finish cutting into the rock.</span>")
|
||||
|
||||
P.update_icon()
|
||||
gets_drilled(user)
|
||||
feedback_add_details("pick_used_mining","[P.name]")
|
||||
@@ -411,11 +408,9 @@ var/global/list/rockTurfEdgeCache
|
||||
|
||||
/turf/simulated/mineral/attack_alien(var/mob/living/carbon/alien/M)
|
||||
to_chat(M, "<span class='notice'>You start digging into the rock...</span>")
|
||||
|
||||
playsound(src, 'sound/effects/break_stone.ogg', 50, 1)
|
||||
if(do_after(M, 40, target = src))
|
||||
to_chat(M, "<span class='notice'>You tunnel into the rock.</span>")
|
||||
|
||||
gets_drilled()
|
||||
|
||||
/turf/simulated/mineral/Bumped(AM as mob|obj)
|
||||
@@ -481,16 +476,13 @@ var/global/list/rockTurfEdgeCache
|
||||
|
||||
if (dug)
|
||||
to_chat(user, "<span class='warning'>This area has already been dug!</span>")
|
||||
|
||||
return
|
||||
|
||||
to_chat(user, "<span class='notice'>You start digging...</span>")
|
||||
|
||||
|
||||
sleep(20)
|
||||
if ((user.loc == T && user.get_active_hand() == W))
|
||||
to_chat(user, "<span class='notice'>You dig a hole.</span>")
|
||||
|
||||
gets_dug()
|
||||
return
|
||||
|
||||
@@ -502,16 +494,13 @@ var/global/list/rockTurfEdgeCache
|
||||
|
||||
if (dug)
|
||||
to_chat(user, "<span class='warning'>This area has already been dug!</span>")
|
||||
|
||||
return
|
||||
|
||||
to_chat(user, "<span class='notice'>You start digging...</span>")
|
||||
|
||||
|
||||
sleep(P.digspeed)
|
||||
if ((user.loc == T && user.get_active_hand() == W))
|
||||
to_chat(user, "<span class='notice'>You dig a hole.</span>")
|
||||
|
||||
gets_dug()
|
||||
return
|
||||
|
||||
|
||||
@@ -125,7 +125,6 @@
|
||||
src.add_fingerprint(usr)
|
||||
if(processing==1)
|
||||
to_chat(usr, "<span class='notice'>The machine is processing.</span>")
|
||||
|
||||
return
|
||||
if(href_list["choose"])
|
||||
chosen = href_list["choose"]
|
||||
|
||||
@@ -68,14 +68,12 @@
|
||||
if(!user.drop_item())
|
||||
return
|
||||
to_chat(user, "<span class='notice'>You add the [C.name] into the bag.</span>")
|
||||
|
||||
contents += C
|
||||
if (istype(W, /obj/item/weapon/moneybag))
|
||||
var/obj/item/weapon/moneybag/C = W
|
||||
for (var/obj/O in C.contents)
|
||||
contents += O;
|
||||
to_chat(user, "<span class='notice'>You empty the [C.name] into the bag.</span>")
|
||||
|
||||
return
|
||||
|
||||
/obj/item/weapon/moneybag/Topic(href, href_list)
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
qdel(src)
|
||||
else if(W.isOn())
|
||||
to_chat(user, "<span class='info'>Not enough fuel to smelt [src].</span>")
|
||||
|
||||
..()
|
||||
|
||||
/obj/item/weapon/ore/Crossed(AM as mob|obj)
|
||||
@@ -66,7 +65,6 @@
|
||||
|
||||
/obj/item/weapon/ore/glass/attack_self(mob/living/user as mob)
|
||||
to_chat(user, "<span class='notice'>You use the sand to make sandstone.</span>")
|
||||
|
||||
var/sandAmt = 1
|
||||
for(var/obj/item/weapon/ore/glass/G in user.loc) // The sand on the floor
|
||||
sandAmt += 1
|
||||
@@ -97,7 +95,6 @@
|
||||
var/obj/item/weapon/weldingtool/W = I
|
||||
if(W.welding)
|
||||
to_chat(user, "<span class='warning'>You can't hit a high enough temperature to smelt [src] properly!</span>")
|
||||
|
||||
else
|
||||
..()
|
||||
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
for(var/obj/item/weapon/ore/O in S.contents)
|
||||
S.remove_from_storage(O, src) //This will move the item to this item's contents
|
||||
to_chat(user, "<span class='notice'>You empty the satchel into the box.</span>")
|
||||
|
||||
return
|
||||
|
||||
/obj/structure/ore_box/attack_hand(mob/user as mob)
|
||||
@@ -93,7 +92,6 @@
|
||||
contents -= O
|
||||
O.loc = src.loc
|
||||
to_chat(usr, "<span class='notice'>You empty the box.</span>")
|
||||
|
||||
src.updateUsrDialog()
|
||||
return
|
||||
|
||||
@@ -109,7 +107,6 @@ obj/structure/ore_box/ex_act(severity, target)
|
||||
|
||||
if(!istype(usr, /mob/living/carbon/human)) //Only living, intelligent creatures with hands can empty ore boxes.
|
||||
to_chat(usr, "<span class='warning'>You are physically incapable of emptying the ore box.</span>")
|
||||
|
||||
return
|
||||
|
||||
if( usr.stat || usr.restrained() )
|
||||
@@ -117,14 +114,12 @@ obj/structure/ore_box/ex_act(severity, target)
|
||||
|
||||
if(!Adjacent(usr)) //You can only empty the box if you can physically reach it
|
||||
to_chat(usr, "You cannot reach the ore box.")
|
||||
|
||||
return
|
||||
|
||||
add_fingerprint(usr)
|
||||
|
||||
if(contents.len < 1)
|
||||
to_chat(usr, "<span class='warning'>The ore box is empty.</span>")
|
||||
|
||||
return
|
||||
|
||||
for (var/obj/item/weapon/ore/O in contents)
|
||||
@@ -132,5 +127,4 @@ obj/structure/ore_box/ex_act(severity, target)
|
||||
O.loc = src.loc
|
||||
to_chat(usr, "<span class='notice'>You empty the ore box.</span>")
|
||||
|
||||
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user