cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 19:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Additional Reagent Fixes (#5170)

Browse Source 
Fixes #5162
Fixes food unable to be placed specifically. Applied the specific placing code to all reagent containers, except for syringes, hypospray, and inhalers.
Fixes missing Kelotane reagent for borg hypospray.
This commit is contained in:
BurgerLUA
2018-08-25 04:52:11 -07:00
committed by Erki
parent 10ea7bac29
commit abec2948c9
9 changed files with 87 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/modules/reagents/reagent_containers.dm
View File

@@ -1,9 +1,13 @@
#define CELLS 8
#define CELLSIZE (32/CELLS)
/obj/item/weapon/reagent_containers
name = "Container"
desc = "..."
icon = 'icons/obj/chemical.dmi'
icon_state = null
w_class = 2
var/list/center_of_mass = list("x" = 16,"y" = 16)
var/amount_per_transfer_from_this = 5
var/possible_transfer_amounts = list(5,10,15,25,30)
var/volume = 30
@@ -59,7 +63,22 @@
if(can_operate(M) && do_surgery(M, user, src))
return
/obj/item/weapon/reagent_containers/afterattack(var/obj/target, var/mob/user, var/proximity)
/obj/item/weapon/reagent_containers/afterattack(var/atom/target, var/mob/user, var/proximity, var/params)
if(proximity && params && istype(target, /obj/structure/table) && center_of_mass && center_of_mass.len)
//Places the item on a grid
var/list/mouse_control = params2list(params)
var/mouse_x = text2num(mouse_control["icon-x"])
var/mouse_y = text2num(mouse_control["icon-y"])
if(isnum(mouse_x) || isnum(mouse_y))
var/cell_x = max(0, min(CELLS-1, round(mouse_x/CELLSIZE)))
var/cell_y = max(0, min(CELLS-1, round(mouse_y/CELLSIZE)))
pixel_x = (CELLSIZE * (0.5 + cell_x)) - center_of_mass["x"]
pixel_y = (CELLSIZE * (0.5 + cell_y)) - center_of_mass["y"]
if(!proximity || !is_open_container())
return
if(is_type_in_list(target,can_be_placed_into))
@@ -234,3 +253,6 @@
playsound(src, 'sound/effects/pour.ogg', 25, 1)
user << "<span class='notice'>You transfer [trans] units of the solution to [target].</span>"
return 1
#undef CELLS
#undef CELLSIZE