mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 12:37:26 +01:00
You can now stick forks into outlets (#31435)
* now shocks * machines + added get_internal_wires * removed duplicate variable on syndicatebomb * adds wire tearing, check if the door has a plating * return a few item_interaction_complete * linting + unpowered message * removed some checks + floodlights + ChemMaster * cut_random_uncut() -> cut_random_uncut_wire() * simplified random wire selection * return ..() + removed / * early return if not machine * get_internal_wires() comment * attackchain * attackchain + comment removal * duplicate variable removal * removed extra lines * removed some / + removed unnecessary checks * removed uncut wirecount function + extra check to cooking machinery * attack chain signal * space * removed some \thes
This commit is contained in:
@@ -577,6 +577,9 @@ GLOBAL_LIST_INIT(aalarm_modes, list(
|
||||
|
||||
update_icon(UPDATE_ICON_STATE)
|
||||
|
||||
/obj/machinery/alarm/get_internal_wires()
|
||||
return wires
|
||||
|
||||
///////////////
|
||||
//END HACKING//
|
||||
///////////////
|
||||
|
||||
@@ -88,6 +88,9 @@ RESTRICT_TYPE(/obj/machinery/cooking)
|
||||
return
|
||||
|
||||
/obj/machinery/cooking/item_interaction(mob/living/user, obj/item/used, list/modifiers)
|
||||
if(istype(used, /obj/item/kitchen/utensil/fork) && panel_open)
|
||||
return NONE
|
||||
|
||||
if(istype(used, /obj/item/storage/part_replacer) || istype(used, /obj/item/autochef_remote))
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -71,6 +71,9 @@
|
||||
********************/
|
||||
|
||||
/obj/machinery/kitchen_machine/item_interaction(mob/living/user, obj/item/used, list/modifiers)
|
||||
if(istype(used, /obj/item/kitchen/utensil/fork))
|
||||
return NONE
|
||||
|
||||
if(operating)
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
|
||||
|
||||
@@ -187,6 +187,9 @@
|
||||
return 0
|
||||
|
||||
/obj/machinery/processor/item_interaction(mob/living/user, obj/item/used, list/modifiers)
|
||||
if(istype(used, /obj/item/kitchen/utensil/fork))
|
||||
return NONE
|
||||
|
||||
if(processing)
|
||||
to_chat(user, SPAN_WARNING("\the [src] is already processing something!"))
|
||||
return ITEM_INTERACT_COMPLETE
|
||||
|
||||
@@ -177,6 +177,9 @@
|
||||
return ..()
|
||||
|
||||
/obj/machinery/smartfridge/item_interaction(mob/living/user, obj/item/used, list/modifiers)
|
||||
if(istype(used, /obj/item/kitchen/utensil/fork))
|
||||
return NONE
|
||||
|
||||
if(istype(used, /obj/item/storage/part_replacer))
|
||||
. = ..()
|
||||
SStgui.update_uis(src)
|
||||
|
||||
@@ -1165,6 +1165,9 @@
|
||||
obj_integrity -= 35
|
||||
return
|
||||
|
||||
/obj/machinery/power/apc/get_internal_wires()
|
||||
return wires
|
||||
|
||||
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc, 24, 24)
|
||||
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/syndicate, 24, 24)
|
||||
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/syndicate/off, 24, 24)
|
||||
|
||||
@@ -142,6 +142,9 @@
|
||||
update_icon()
|
||||
|
||||
/obj/machinery/chem_master/item_interaction(mob/living/user, obj/item/used, list/modifiers)
|
||||
if(istype(used, /obj/item/kitchen/utensil/fork))
|
||||
return NONE
|
||||
|
||||
if(istype(used, /obj/item/storage/part_replacer))
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -166,6 +166,9 @@
|
||||
default_unfasten_wrench(user, I)
|
||||
|
||||
/obj/machinery/reagentgrinder/item_interaction(mob/living/user, obj/item/used, list/modifiers)
|
||||
if(istype(used, /obj/item/kitchen/utensil/fork))
|
||||
return NONE
|
||||
|
||||
if(istype(used, /obj/item/storage/part_replacer))
|
||||
. = ..()
|
||||
SStgui.update_uis(src)
|
||||
|
||||
@@ -94,6 +94,8 @@
|
||||
update_appearance(UPDATE_OVERLAYS)
|
||||
|
||||
/obj/machinery/organ_analyzer/item_interaction(mob/living/user, obj/item/used, list/modifiers)
|
||||
if(istype(used, /obj/item/kitchen/utensil/fork))
|
||||
return NONE
|
||||
if(istype(used, /obj/item/storage/part_replacer))
|
||||
return ..()
|
||||
if(!istype(used, /obj/item/organ/internal))
|
||||
|
||||
@@ -141,6 +141,9 @@
|
||||
return
|
||||
|
||||
/obj/machinery/smithing/kinetic_assembler/item_interaction(mob/living/user, obj/item/used, list/modifiers)
|
||||
if(istype(used, /obj/item/kitchen/utensil/fork))
|
||||
return NONE
|
||||
|
||||
if(istype(used, /obj/item/storage/part_replacer))
|
||||
return ..()
|
||||
|
||||
@@ -365,6 +368,9 @@
|
||||
icon_state = "assembler_wires"
|
||||
|
||||
/obj/machinery/smithing/scientific_assembler/item_interaction(mob/living/user, obj/item/used, list/modifiers)
|
||||
if(istype(used, /obj/item/kitchen/utensil/fork))
|
||||
return NONE
|
||||
|
||||
if(istype(used, /obj/item/storage/part_replacer))
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -46,6 +46,9 @@
|
||||
. = ..()
|
||||
|
||||
/obj/machinery/smithing/item_interaction(mob/living/user, obj/item/used, list/modifiers)
|
||||
if(istype(used, /obj/item/kitchen/utensil/fork))
|
||||
return NONE
|
||||
|
||||
if(istype(used, /obj/item/grab))
|
||||
var/obj/item/grab/G = used
|
||||
if(HAS_TRAIT(user, TRAIT_PACIFISM))
|
||||
|
||||
Reference in New Issue
Block a user