cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes High Cap water tanks, lets drones move tanks again.

Browse Source
This commit is contained in:
Anewbe
2017-12-04 17:43:57 -06:00
parent 0d458b204e
commit d2a90fcec4
2 changed files with 66 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/living/silicon/robot/drone/drone.dm
View File

@@ -37,7 +37,7 @@ var/list/mob_hat_cache = list()
integrated_light_power = 3
local_transmit = 1
can_pull_size = ITEMSIZE_NORMAL
can_pull_size = ITEMSIZE_NO_CONTAINER
can_pull_mobs = MOB_PULL_SMALLER
mob_bump_flag = SIMPLE_ANIMAL
@@ -71,7 +71,6 @@ var/list/mob_hat_cache = list()
module_type = /obj/item/weapon/robot_module/drone/construction
hat_x_offset = 1
hat_y_offset = -12
can_pull_size = ITEMSIZE_HUGE
can_pull_mobs = MOB_PULL_SAME
/mob/living/silicon/robot/drone/New()

38
code/modules/reagents/reagent_dispenser.dm
View File

@@ -15,15 +15,15 @@
attackby(obj/item/weapon/W as obj, mob/user as mob)
return
New()
var/datum/reagents/R = new/datum/reagents(1000)
/obj/structure/reagent_dispensers/New()
var/datum/reagents/R = new/datum/reagents(5000)
reagents = R
R.my_atom = src
if (!possible_transfer_amounts)
src.verbs -= /obj/structure/reagent_dispensers/verb/set_APTFT
..()
examine(mob/user)
/obj/structure/reagent_dispensers/examine(mob/user)
if(!..(user, 2))
return
user << "<span class='notice'>It contains:</span>"
@@ -33,7 +33,7 @@
else
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 category = "Object"
set src in view(1)
@@ -41,7 +41,7 @@
if (N)
amount_per_transfer_from_this = N
ex_act(severity)
/obj/structure/reagent_dispensers/ex_act(severity)
switch(severity)
if(1.0)
qdel(src)
@@ -64,8 +64,6 @@
//Dispensers
/obj/structure/reagent_dispensers/watertank
name = "watertank"
@@ -73,16 +71,19 @@
icon = 'icons/obj/objects.dmi'
icon_state = "watertank"
amount_per_transfer_from_this = 10
New()
..()
reagents.add_reagent("water",1000)
/obj/structure/reagent_dispensers/watertank/high/New()
/obj/structure/reagent_dispensers/watertank/New()
..()
reagents.add_reagent("water", 1000)
/obj/structure/reagent_dispensers/watertank/high
name = "high-capacity water tank"
desc = "A highly-pressurized water tank made to hold vast amounts of water.."
icon_state = "watertank_high"
/obj/structure/reagent_dispensers/watertank/high/New()
..()
reagents.add_reagent("water",4000)
reagents.add_reagent("water", 4000)
/obj/structure/reagent_dispensers/fueltank
name = "fueltank"
@@ -92,7 +93,8 @@
amount_per_transfer_from_this = 10
var/modded = 0
var/obj/item/device/assembly_holder/rig = null
New()
/obj/structure/reagent_dispensers/fueltank/New()
..()
reagents.add_reagent("fuel",1000)
@@ -201,7 +203,8 @@
anchored = 1
density = 0
amount_per_transfer_from_this = 45
New()
/obj/structure/reagent_dispensers/peppertank/New()
..()
reagents.add_reagent("condensedcapsaicin",1000)
@@ -347,7 +350,8 @@
icon = 'icons/obj/objects.dmi'
icon_state = "beertankTEMP"
amount_per_transfer_from_this = 10
New()
/obj/structure/reagent_dispensers/beerkeg/New()
..()
reagents.add_reagent("beer",1000)
@@ -365,7 +369,7 @@
amount_per_transfer_from_this = 10
anchored = 1
New()
/obj/structure/reagent_dispensers/virusfood/New()
..()
reagents.add_reagent("virusfood", 1000)
@@ -377,6 +381,6 @@
amount_per_transfer_from_this = 10
anchored = 1
New()
/obj/structure/reagent_dispensers/acid/New()
..()
reagents.add_reagent("sacid", 1000)