mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 11:13:16 +00:00
Fixes High Cap water tanks, lets drones move tanks again.
This commit is contained in:
@@ -37,7 +37,7 @@ var/list/mob_hat_cache = list()
|
|||||||
integrated_light_power = 3
|
integrated_light_power = 3
|
||||||
local_transmit = 1
|
local_transmit = 1
|
||||||
|
|
||||||
can_pull_size = ITEMSIZE_NORMAL
|
can_pull_size = ITEMSIZE_NO_CONTAINER
|
||||||
can_pull_mobs = MOB_PULL_SMALLER
|
can_pull_mobs = MOB_PULL_SMALLER
|
||||||
|
|
||||||
mob_bump_flag = SIMPLE_ANIMAL
|
mob_bump_flag = SIMPLE_ANIMAL
|
||||||
@@ -71,7 +71,6 @@ var/list/mob_hat_cache = list()
|
|||||||
module_type = /obj/item/weapon/robot_module/drone/construction
|
module_type = /obj/item/weapon/robot_module/drone/construction
|
||||||
hat_x_offset = 1
|
hat_x_offset = 1
|
||||||
hat_y_offset = -12
|
hat_y_offset = -12
|
||||||
can_pull_size = ITEMSIZE_HUGE
|
|
||||||
can_pull_mobs = MOB_PULL_SAME
|
can_pull_mobs = MOB_PULL_SAME
|
||||||
|
|
||||||
/mob/living/silicon/robot/drone/New()
|
/mob/living/silicon/robot/drone/New()
|
||||||
|
|||||||
@@ -15,15 +15,15 @@
|
|||||||
attackby(obj/item/weapon/W as obj, mob/user as mob)
|
attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||||
return
|
return
|
||||||
|
|
||||||
New()
|
/obj/structure/reagent_dispensers/New()
|
||||||
var/datum/reagents/R = new/datum/reagents(1000)
|
var/datum/reagents/R = new/datum/reagents(5000)
|
||||||
reagents = R
|
reagents = R
|
||||||
R.my_atom = src
|
R.my_atom = src
|
||||||
if (!possible_transfer_amounts)
|
if (!possible_transfer_amounts)
|
||||||
src.verbs -= /obj/structure/reagent_dispensers/verb/set_APTFT
|
src.verbs -= /obj/structure/reagent_dispensers/verb/set_APTFT
|
||||||
..()
|
..()
|
||||||
|
|
||||||
examine(mob/user)
|
/obj/structure/reagent_dispensers/examine(mob/user)
|
||||||
if(!..(user, 2))
|
if(!..(user, 2))
|
||||||
return
|
return
|
||||||
user << "<span class='notice'>It contains:</span>"
|
user << "<span class='notice'>It contains:</span>"
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
else
|
else
|
||||||
user << "<span class='notice'>Nothing.</span>"
|
user << "<span class='notice'>Nothing.</span>"
|
||||||
|
|
||||||
verb/set_APTFT() //set amount_per_transfer_from_this
|
/obj/structure/reagent_dispensers/verb/set_APTFT() //set amount_per_transfer_from_this
|
||||||
set name = "Set transfer amount"
|
set name = "Set transfer amount"
|
||||||
set category = "Object"
|
set category = "Object"
|
||||||
set src in view(1)
|
set src in view(1)
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
if (N)
|
if (N)
|
||||||
amount_per_transfer_from_this = N
|
amount_per_transfer_from_this = N
|
||||||
|
|
||||||
ex_act(severity)
|
/obj/structure/reagent_dispensers/ex_act(severity)
|
||||||
switch(severity)
|
switch(severity)
|
||||||
if(1.0)
|
if(1.0)
|
||||||
qdel(src)
|
qdel(src)
|
||||||
@@ -64,8 +64,6 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//Dispensers
|
//Dispensers
|
||||||
/obj/structure/reagent_dispensers/watertank
|
/obj/structure/reagent_dispensers/watertank
|
||||||
name = "watertank"
|
name = "watertank"
|
||||||
@@ -73,14 +71,17 @@
|
|||||||
icon = 'icons/obj/objects.dmi'
|
icon = 'icons/obj/objects.dmi'
|
||||||
icon_state = "watertank"
|
icon_state = "watertank"
|
||||||
amount_per_transfer_from_this = 10
|
amount_per_transfer_from_this = 10
|
||||||
New()
|
|
||||||
|
/obj/structure/reagent_dispensers/watertank/New()
|
||||||
..()
|
..()
|
||||||
reagents.add_reagent("water", 1000)
|
reagents.add_reagent("water", 1000)
|
||||||
|
|
||||||
/obj/structure/reagent_dispensers/watertank/high/New()
|
/obj/structure/reagent_dispensers/watertank/high
|
||||||
name = "high-capacity water tank"
|
name = "high-capacity water tank"
|
||||||
desc = "A highly-pressurized water tank made to hold vast amounts of water.."
|
desc = "A highly-pressurized water tank made to hold vast amounts of water.."
|
||||||
icon_state = "watertank_high"
|
icon_state = "watertank_high"
|
||||||
|
|
||||||
|
/obj/structure/reagent_dispensers/watertank/high/New()
|
||||||
..()
|
..()
|
||||||
reagents.add_reagent("water", 4000)
|
reagents.add_reagent("water", 4000)
|
||||||
|
|
||||||
@@ -92,7 +93,8 @@
|
|||||||
amount_per_transfer_from_this = 10
|
amount_per_transfer_from_this = 10
|
||||||
var/modded = 0
|
var/modded = 0
|
||||||
var/obj/item/device/assembly_holder/rig = null
|
var/obj/item/device/assembly_holder/rig = null
|
||||||
New()
|
|
||||||
|
/obj/structure/reagent_dispensers/fueltank/New()
|
||||||
..()
|
..()
|
||||||
reagents.add_reagent("fuel",1000)
|
reagents.add_reagent("fuel",1000)
|
||||||
|
|
||||||
@@ -201,7 +203,8 @@
|
|||||||
anchored = 1
|
anchored = 1
|
||||||
density = 0
|
density = 0
|
||||||
amount_per_transfer_from_this = 45
|
amount_per_transfer_from_this = 45
|
||||||
New()
|
|
||||||
|
/obj/structure/reagent_dispensers/peppertank/New()
|
||||||
..()
|
..()
|
||||||
reagents.add_reagent("condensedcapsaicin",1000)
|
reagents.add_reagent("condensedcapsaicin",1000)
|
||||||
|
|
||||||
@@ -347,7 +350,8 @@
|
|||||||
icon = 'icons/obj/objects.dmi'
|
icon = 'icons/obj/objects.dmi'
|
||||||
icon_state = "beertankTEMP"
|
icon_state = "beertankTEMP"
|
||||||
amount_per_transfer_from_this = 10
|
amount_per_transfer_from_this = 10
|
||||||
New()
|
|
||||||
|
/obj/structure/reagent_dispensers/beerkeg/New()
|
||||||
..()
|
..()
|
||||||
reagents.add_reagent("beer",1000)
|
reagents.add_reagent("beer",1000)
|
||||||
|
|
||||||
@@ -365,7 +369,7 @@
|
|||||||
amount_per_transfer_from_this = 10
|
amount_per_transfer_from_this = 10
|
||||||
anchored = 1
|
anchored = 1
|
||||||
|
|
||||||
New()
|
/obj/structure/reagent_dispensers/virusfood/New()
|
||||||
..()
|
..()
|
||||||
reagents.add_reagent("virusfood", 1000)
|
reagents.add_reagent("virusfood", 1000)
|
||||||
|
|
||||||
@@ -377,6 +381,6 @@
|
|||||||
amount_per_transfer_from_this = 10
|
amount_per_transfer_from_this = 10
|
||||||
anchored = 1
|
anchored = 1
|
||||||
|
|
||||||
New()
|
/obj/structure/reagent_dispensers/acid/New()
|
||||||
..()
|
..()
|
||||||
reagents.add_reagent("sacid", 1000)
|
reagents.add_reagent("sacid", 1000)
|
||||||
|
|||||||
Reference in New Issue
Block a user