cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 10:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into uguu

Browse Source
This commit is contained in:
Nanai
2013-10-19 13:13:02 -04:00
parent f78800a248 98caca85f0
commit 752f9f80eb
213 changed files with 17493 additions and 16999 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()
..()
@@ -1339,7 +1333,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)

2
code/modules/reagents/reagent_containers/food/snacks/grown.dm
View File

@@ -886,7 +886,7 @@
user.SetLuminosity(round(user.luminosity + (potency/10),1))
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/dropped(mob/user)
user.SetLuminosity(round(user.luminosity + (potency/10),1))
user.SetLuminosity(round(user.luminosity - (potency/10),1))
SetLuminosity(round(potency/10,1))

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)