cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-01 21:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Massive click code rework by SuperSayu, ported from TG.

Browse Source 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
This commit is contained in:
Mloc-Argent
2013-10-07 16:49:41 +01:00
parent 98158dac93
commit 8b2c3fc153
117 changed files with 896 additions and 4606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/reagents/reagent_containers/food/drinks.dm
View File

@@ -65,7 +65,8 @@
return 0
afterattack(obj/target, mob/user , flag)
afterattack(obj/target, mob/user, proximity)
if(!proximity) return
if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.

11
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -96,15 +96,9 @@
return 0
/obj/item/weapon/reagent_containers/food/snacks/afterattack(obj/target, mob/user , flag)
/obj/item/weapon/reagent_containers/food/snacks/afterattack(obj/target, mob/user, proximity)
return
/obj/item/weapon/reagent_containers/food/snacks/examine()
set src in view()
..()
@@ -1338,7 +1332,8 @@
..()
reagents.add_reagent("nutriment",10)
afterattack(obj/O as obj, mob/user as mob)
afterattack(obj/O as obj, mob/user as mob, proximity)
if(!proximity) return
if(istype(O,/obj/structure/sink) && !wrapped)
user << "You place \the [name] under a stream of water..."
loc = get_turf(O)

3
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -64,7 +64,8 @@
flags |= OPENCONTAINER
update_icon()
afterattack(obj/target, mob/user , flag)
afterattack(obj/target, mob/user, proximity)
if(!proximity) return
if (!is_open_container())
return

3
code/modules/reagents/reagent_containers/pill.dm
View File

@@ -57,7 +57,8 @@
return 0
afterattack(obj/target, mob/user , flag)
afterattack(obj/target, mob/user, proximity)
if(!proximity) return
if(target.is_open_container() != 0 && target.reagents)
if(!target.reagents.total_volume)

6
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -4,7 +4,7 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "cleaner"
item_state = "cleaner"
flags = TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
flags = TABLEPASS|OPENCONTAINER|FPRINT|NOBLUDGEON
slot_flags = SLOT_BELT
throwforce = 3
w_class = 2.0
@@ -243,7 +243,9 @@
reagents.add_reagent("plantbgone", 100)
/obj/item/weapon/reagent_containers/spray/plantbgone/afterattack(atom/A as mob|obj, mob/user as mob)
/obj/item/weapon/reagent_containers/spray/plantbgone/afterattack(atom/A as mob|obj, mob/user as mob, proximity)
if(!proximity) return
if (istype(A, /obj/machinery/hydroponics)) // We are targeting hydrotray
return

3
code/modules/reagents/reagent_containers/syringes.dm
View File

@@ -50,7 +50,8 @@
return
afterattack(obj/target, mob/user , flag)
afterattack(obj/target, mob/user, proximity)
if(!proximity) return
if(!target.reagents) return
if(mode == SYRINGE_BROKEN)