for-the-strength-from-which-he-gives-is-unerring

This commit is contained in:
Fox McCloud
2019-10-05 02:08:11 -04:00
parent 5170f3fbae
commit 67dc33ac3f
141 changed files with 722 additions and 542 deletions
@@ -49,6 +49,7 @@ GLOBAL_LIST(labor_sheet_values)
return
else
to_chat(user, "<span class='notice'>There's an ID inserted already.</span>")
return
return ..()
/obj/machinery/mineral/labor_claim_console/attack_hand(mob/user)
@@ -154,6 +155,7 @@ GLOBAL_LIST(labor_sheet_values)
if(istype(I, /obj/item/stack/sheet) && user.canUnEquip(I))
var/obj/item/stack/sheet/inp = I
points += inp.point_value * inp.amount
return
return ..()
/**********************Point Lookup Console**************************/
@@ -180,5 +182,5 @@ GLOBAL_LIST(labor_sheet_values)
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>")
else
return ..()
return
return ..()
@@ -138,7 +138,7 @@
/obj/machinery/anomalous_crystal/attackby(obj/item/I, mob/user, params)
ActivationReaction(user,"weapon")
..()
return ..()
/obj/machinery/anomalous_crystal/bullet_act(obj/item/projectile/P, def_zone)
..()
+3 -3
View File
@@ -194,7 +194,7 @@
return
else
RedeemVoucher(I, user)
return
return
if(istype(I,/obj/item/card/id))
if(!powered())
return
@@ -206,8 +206,8 @@
C.forceMove(src)
inserted_id = C
interact(user)
return
..()
return
return ..()
/obj/machinery/mineral/equipment_vendor/proc/RedeemVoucher(obj/item/mining_voucher/voucher, mob/redeemer)
var/items = list("Survival Capsule and Explorer's Webbing", "Resonator Kit", "Minebot Kit", "Extraction and Rescue Kit", "Crusher Kit", "Mining Conscription Kit")
+3 -4
View File
@@ -10,10 +10,7 @@
pressure_resistance = 5 * ONE_ATMOSPHERE
/obj/structure/ore_box/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/t_scanner/adv_mining_scanner))
attack_hand(user)
return
else if(istype(W, /obj/item/stack/ore))
if(istype(W, /obj/item/stack/ore))
if(!user.drop_item())
return
W.forceMove(src)
@@ -30,6 +27,8 @@
if(do_after(user, 50 * C.toolspeed, target = src))
user.visible_message("<span class='notice'>[user] pries [src] apart.</span>", "<span class='notice'>You pry apart [src].</span>", "<span class='italics'>You hear splitting wood.</span>")
deconstruct(TRUE, user)
else
return ..()
/obj/structure/ore_box/attack_hand(mob/user)
if(Adjacent(user))