mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 15:45:25 +01:00
Attack Chain Migration: /obj/item/card (#27556)
* the work so far * She returns on my TRUE till I ITEM_INTERACT_SUCCESS * do this too (rip good commit name) * Did you know? You can stamp ID cards!
This commit is contained in:
@@ -315,10 +315,11 @@
|
||||
|
||||
/obj/machinery/economy/atm/cmag_act(mob/user)
|
||||
if(HAS_TRAIT(src, TRAIT_CMAGGED))
|
||||
return
|
||||
return FALSE
|
||||
playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
|
||||
to_chat(user, "<span class='warning'>Yellow ooze seeps into the [src]'s card slot...</span>")
|
||||
ADD_TRAIT(src, TRAIT_CMAGGED, CLOWN_EMAG)
|
||||
return TRUE
|
||||
|
||||
/obj/machinery/economy/atm/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -575,6 +575,8 @@
|
||||
if(!HAS_TRAIT(src, TRAIT_CMAGGED))
|
||||
to_chat(user, "<span class='notice'>You smear the bananium ooze all over the pizza bomb's internals! You think you smell a bit of tomato sauce.</span>")
|
||||
ADD_TRAIT(src, TRAIT_CMAGGED, CLOWN_EMAG)
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/obj/item/pizzabox/pizza_bomb/attackby__legacy__attackchain(obj/item/I, mob/user, params)
|
||||
if(!open)
|
||||
|
||||
@@ -669,6 +669,8 @@
|
||||
ADD_TRAIT(src, TRAIT_CMAGGED, CLOWN_EMAG)
|
||||
update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_ICON)
|
||||
playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/obj/item/disk/plantgene/uncmag()
|
||||
update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_ICON)
|
||||
|
||||
@@ -501,16 +501,16 @@
|
||||
icon_state = "data"
|
||||
var/points = 500
|
||||
|
||||
/obj/item/card/mining_point_card/attackby__legacy__attackchain(obj/item/I, mob/user, params)
|
||||
if(istype(I, /obj/item/card/id))
|
||||
/obj/item/card/mining_point_card/item_interaction(mob/living/user, obj/item/used, list/modifiers)
|
||||
if(istype(used, /obj/item/card/id))
|
||||
if(points)
|
||||
var/obj/item/card/id/C = I
|
||||
var/obj/item/card/id/C = used
|
||||
C.mining_points += points
|
||||
to_chat(user, "<span class='notice'>You transfer [points] points to [C].</span>")
|
||||
points = 0
|
||||
else
|
||||
to_chat(user, "<span class='notice'>There's no points left on [src].</span>")
|
||||
..()
|
||||
return ITEM_INTERACT_SUCCESS
|
||||
|
||||
/obj/item/card/mining_point_card/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -132,7 +132,7 @@
|
||||
|
||||
/mob/living/simple_animal/bot/honkbot/cmag_act(mob/user)
|
||||
if(HAS_TRAIT(src, TRAIT_CMAGGED))
|
||||
return
|
||||
return FALSE
|
||||
if(locked || !open)
|
||||
to_chat(user, "<span class='warning'>Unlock and open it with a screwdriver first!</span>")
|
||||
return FALSE
|
||||
@@ -147,6 +147,7 @@
|
||||
to_chat(user, "<span class='notice'>You smear bananium ooze all over [src]'s circuitry!</span>")
|
||||
add_attack_logs(user, src, "Cmagged")
|
||||
show_laws()
|
||||
return TRUE
|
||||
|
||||
/mob/living/simple_animal/bot/honkbot/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -518,7 +518,7 @@
|
||||
|
||||
/obj/machinery/computer/supplycomp/cmag_act(mob/user)
|
||||
if(HAS_TRAIT(src, TRAIT_CMAGGED))
|
||||
return
|
||||
return FALSE
|
||||
to_chat(user, "<span class='notice sans'>Special supplies unlocked.</span>")
|
||||
playsound(src, "sparks", 75, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
|
||||
ADD_TRAIT(src, TRAIT_CMAGGED, CLOWN_EMAG)
|
||||
|
||||
Reference in New Issue
Block a user