mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Makes More Machines Movable (#4801)
* Makes More Machines Movable Adds in the ability to wrench/unwrench a number of machines that previously could not be. Now you're able to move: Laptop venders! Seed extractors! Biogenerators! Drying racks! Microwaves! Cooking machines! Gibbers! Chemmasters/Condimasters! Bioprinters! Virology machines! Washing machines! Tested with no apparent problems. * Knew I forgot something
This commit is contained in:
@@ -46,6 +46,8 @@
|
|||||||
return
|
return
|
||||||
if(default_part_replacement(user, O))
|
if(default_part_replacement(user, O))
|
||||||
return
|
return
|
||||||
|
if(default_unfasten_wrench(user, O, 40))
|
||||||
|
return
|
||||||
if(istype(O, /obj/item/weapon/reagent_containers/glass))
|
if(istype(O, /obj/item/weapon/reagent_containers/glass))
|
||||||
if(beaker)
|
if(beaker)
|
||||||
user << "<span class='notice'>]The [src] is already loaded.</span>"
|
user << "<span class='notice'>]The [src] is already loaded.</span>"
|
||||||
|
|||||||
@@ -44,6 +44,8 @@
|
|||||||
return
|
return
|
||||||
if(default_part_replacement(user, O))
|
if(default_part_replacement(user, O))
|
||||||
return
|
return
|
||||||
|
if(default_unfasten_wrench(user, O, 20))
|
||||||
|
return
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
/obj/machinery/organ_printer/update_icon()
|
/obj/machinery/organ_printer/update_icon()
|
||||||
|
|||||||
@@ -29,6 +29,9 @@
|
|||||||
/obj/machinery/lapvend/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
/obj/machinery/lapvend/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||||
var/obj/item/weapon/card/id/I = W.GetID()
|
var/obj/item/weapon/card/id/I = W.GetID()
|
||||||
|
|
||||||
|
if(default_unfasten_wrench(user, W, 20))
|
||||||
|
return
|
||||||
|
|
||||||
if(vendmode == 1 && I)
|
if(vendmode == 1 && I)
|
||||||
scan_id(I, W)
|
scan_id(I, W)
|
||||||
vendmode = 0
|
vendmode = 0
|
||||||
|
|||||||
@@ -50,6 +50,9 @@
|
|||||||
user << "<span class='warning'>\The [src] is running!</span>"
|
user << "<span class='warning'>\The [src] is running!</span>"
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if(default_unfasten_wrench(user, I, 20))
|
||||||
|
return
|
||||||
|
|
||||||
// We are trying to cook a grabbed mob.
|
// We are trying to cook a grabbed mob.
|
||||||
var/obj/item/weapon/grab/G = I
|
var/obj/item/weapon/grab/G = I
|
||||||
if(istype(G))
|
if(istype(G))
|
||||||
|
|||||||
@@ -92,6 +92,9 @@
|
|||||||
/obj/machinery/gibber/attackby(var/obj/item/W, var/mob/user)
|
/obj/machinery/gibber/attackby(var/obj/item/W, var/mob/user)
|
||||||
var/obj/item/weapon/grab/G = W
|
var/obj/item/weapon/grab/G = W
|
||||||
|
|
||||||
|
if(default_unfasten_wrench(user, W, 40))
|
||||||
|
return
|
||||||
|
|
||||||
if(!istype(G))
|
if(!istype(G))
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
|
|||||||
@@ -95,6 +95,8 @@
|
|||||||
return
|
return
|
||||||
else if(default_deconstruction_crowbar(user, O))
|
else if(default_deconstruction_crowbar(user, O))
|
||||||
return
|
return
|
||||||
|
else if(default_unfasten_wrench(user, O, 10))
|
||||||
|
return
|
||||||
|
|
||||||
else if(src.dirty==100) // The microwave is all dirty so can't be used!
|
else if(src.dirty==100) // The microwave is all dirty so can't be used!
|
||||||
if(istype(O, /obj/item/weapon/reagent_containers/spray/cleaner) || istype(O, /obj/item/weapon/soap)) // If they're trying to clean it then let them
|
if(istype(O, /obj/item/weapon/reagent_containers/spray/cleaner) || istype(O, /obj/item/weapon/soap)) // If they're trying to clean it then let them
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
var/locked = 0
|
var/locked = 0
|
||||||
var/scan_id = 1
|
var/scan_id = 1
|
||||||
var/is_secure = 0
|
var/is_secure = 0
|
||||||
|
var/wrenchable = 0
|
||||||
var/datum/wires/smartfridge/wires = null
|
var/datum/wires/smartfridge/wires = null
|
||||||
|
|
||||||
/obj/machinery/smartfridge/secure
|
/obj/machinery/smartfridge/secure
|
||||||
@@ -128,6 +129,7 @@
|
|||||||
/obj/machinery/smartfridge/drying_rack
|
/obj/machinery/smartfridge/drying_rack
|
||||||
name = "\improper Drying Rack"
|
name = "\improper Drying Rack"
|
||||||
desc = "A machine for drying plants."
|
desc = "A machine for drying plants."
|
||||||
|
wrenchable = 1
|
||||||
icon_state = "drying_rack"
|
icon_state = "drying_rack"
|
||||||
icon_on = "drying_rack_on"
|
icon_on = "drying_rack_on"
|
||||||
icon_off = "drying_rack"
|
icon_off = "drying_rack"
|
||||||
@@ -217,6 +219,9 @@
|
|||||||
nanomanager.update_uis(src)
|
nanomanager.update_uis(src)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if(wrenchable && default_unfasten_wrench(user, O, 20))
|
||||||
|
return
|
||||||
|
|
||||||
if(istype(O, /obj/item/device/multitool)||istype(O, /obj/item/weapon/wirecutters))
|
if(istype(O, /obj/item/device/multitool)||istype(O, /obj/item/weapon/wirecutters))
|
||||||
if(panel_open)
|
if(panel_open)
|
||||||
attack_hand(user)
|
attack_hand(user)
|
||||||
|
|||||||
@@ -40,4 +40,7 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob
|
|||||||
user << "<span class='notice'>You extract some seeds from the grass tile.</span>"
|
user << "<span class='notice'>You extract some seeds from the grass tile.</span>"
|
||||||
new /obj/item/seeds/grassseed(loc)
|
new /obj/item/seeds/grassseed(loc)
|
||||||
|
|
||||||
|
else if(default_unfasten_wrench(user, O, 20))
|
||||||
|
return
|
||||||
|
|
||||||
return
|
return
|
||||||
@@ -88,6 +88,8 @@
|
|||||||
return
|
return
|
||||||
if(default_deconstruction_crowbar(user, W))
|
if(default_deconstruction_crowbar(user, W))
|
||||||
return
|
return
|
||||||
|
if(default_unfasten_wrench(user, W, 40))
|
||||||
|
return
|
||||||
/*if(istype(W,/obj/item/weapon/screwdriver))
|
/*if(istype(W,/obj/item/weapon/screwdriver))
|
||||||
panel = !panel
|
panel = !panel
|
||||||
user << "<span class='notice'>You [panel ? "open" : "close"] the [src]'s maintenance panel</span>"*/
|
user << "<span class='notice'>You [panel ? "open" : "close"] the [src]'s maintenance panel</span>"*/
|
||||||
|
|||||||
@@ -68,6 +68,10 @@
|
|||||||
user.drop_item()
|
user.drop_item()
|
||||||
B.loc = src
|
B.loc = src
|
||||||
user << "You add \the [loaded_pill_bottle] into the dispenser slot!"
|
user << "You add \the [loaded_pill_bottle] into the dispenser slot!"
|
||||||
|
|
||||||
|
else if(default_unfasten_wrench(user, B, 20))
|
||||||
|
return
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
/obj/machinery/chem_master/attack_hand(mob/user as mob)
|
/obj/machinery/chem_master/attack_hand(mob/user as mob)
|
||||||
|
|||||||
@@ -11,7 +11,10 @@
|
|||||||
var/obj/item/weapon/virusdish/dish = null
|
var/obj/item/weapon/virusdish/dish = null
|
||||||
|
|
||||||
/obj/machinery/disease2/diseaseanalyser/attackby(var/obj/O as obj, var/mob/user as mob)
|
/obj/machinery/disease2/diseaseanalyser/attackby(var/obj/O as obj, var/mob/user as mob)
|
||||||
if(!istype(O,/obj/item/weapon/virusdish)) return
|
if(default_unfasten_wrench(user, O, 20))
|
||||||
|
return
|
||||||
|
|
||||||
|
else if(!istype(O,/obj/item/weapon/virusdish)) return
|
||||||
|
|
||||||
if(dish)
|
if(dish)
|
||||||
user << "\The [src] is already loaded."
|
user << "\The [src] is already loaded."
|
||||||
|
|||||||
@@ -13,6 +13,9 @@
|
|||||||
if(istype(O, /obj/item/weapon/screwdriver))
|
if(istype(O, /obj/item/weapon/screwdriver))
|
||||||
return ..(O,user)
|
return ..(O,user)
|
||||||
|
|
||||||
|
if(default_unfasten_wrench(user, O, 20))
|
||||||
|
return
|
||||||
|
|
||||||
if(istype(O,/obj/item/weapon/reagent_containers/glass/beaker/vial))
|
if(istype(O,/obj/item/weapon/reagent_containers/glass/beaker/vial))
|
||||||
if(sample)
|
if(sample)
|
||||||
user << "\The [src] is already loaded."
|
user << "\The [src] is already loaded."
|
||||||
|
|||||||
@@ -15,6 +15,9 @@
|
|||||||
if(istype(I, /obj/item/weapon/screwdriver))
|
if(istype(I, /obj/item/weapon/screwdriver))
|
||||||
return ..(I,user)
|
return ..(I,user)
|
||||||
|
|
||||||
|
if(default_unfasten_wrench(user, I, 20))
|
||||||
|
return
|
||||||
|
|
||||||
if(istype(I,/obj/item/weapon/virusdish))
|
if(istype(I,/obj/item/weapon/virusdish))
|
||||||
var/mob/living/carbon/c = user
|
var/mob/living/carbon/c = user
|
||||||
if (dish)
|
if (dish)
|
||||||
|
|||||||
@@ -15,6 +15,9 @@
|
|||||||
var/toxins = 0
|
var/toxins = 0
|
||||||
|
|
||||||
/obj/machinery/disease2/incubator/attackby(var/obj/O as obj, var/mob/user as mob)
|
/obj/machinery/disease2/incubator/attackby(var/obj/O as obj, var/mob/user as mob)
|
||||||
|
if(default_unfasten_wrench(user, O, 20))
|
||||||
|
return
|
||||||
|
|
||||||
if(istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/syringe))
|
if(istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/syringe))
|
||||||
|
|
||||||
if(beaker)
|
if(beaker)
|
||||||
|
|||||||
@@ -28,7 +28,10 @@
|
|||||||
icon_state = "isolator"
|
icon_state = "isolator"
|
||||||
|
|
||||||
/obj/machinery/disease2/isolator/attackby(var/obj/O as obj, var/mob/user)
|
/obj/machinery/disease2/isolator/attackby(var/obj/O as obj, var/mob/user)
|
||||||
if(!istype(O,/obj/item/weapon/reagent_containers/syringe)) return
|
if(default_unfasten_wrench(user, O, 20))
|
||||||
|
return
|
||||||
|
|
||||||
|
else if(!istype(O,/obj/item/weapon/reagent_containers/syringe)) return
|
||||||
var/obj/item/weapon/reagent_containers/syringe/S = O
|
var/obj/item/weapon/reagent_containers/syringe/S = O
|
||||||
|
|
||||||
if(sample)
|
if(sample)
|
||||||
|
|||||||
4
html/changelogs/PrismaticGynoid-movethosemachines.yml
Normal file
4
html/changelogs/PrismaticGynoid-movethosemachines.yml
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
author: PrismaticGynoid
|
||||||
|
delete-after: True
|
||||||
|
changes:
|
||||||
|
- rscadd: "A lot more machines can now be moved with a wrench, mostly kitchen, hydroponics, and virology machines."
|
||||||
Reference in New Issue
Block a user