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

Merge pull request #10570 from Zuhayr/master

Browse Source 
Couple of fixes.
This commit is contained in:
mwerezak
2015-08-12 15:00:36 -04:00
parent 5f17cf4397 64a89fc5e4
commit 5b6c5ee5ce
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/hydroponics/seed.dm
View File

@@ -689,10 +689,11 @@
else else
product = new /obj/item/weapon/reagent_containers/food/snacks/grown(get_turf(user),name) product = new /obj/item/weapon/reagent_containers/food/snacks/grown(get_turf(user),name)
if(get_trait(TRAIT_PRODUCT_COLOUR)) if(get_trait(TRAIT_PRODUCT_COLOUR))
product.color = get_trait(TRAIT_PRODUCT_COLOUR) if(!istype(product, /mob))
if(istype(product,/obj/item/weapon/reagent_containers/food)) product.color = get_trait(TRAIT_PRODUCT_COLOUR)
var/obj/item/weapon/reagent_containers/food/food = product if(istype(product,/obj/item/weapon/reagent_containers/food))
food.filling_color = get_trait(TRAIT_PRODUCT_COLOUR) var/obj/item/weapon/reagent_containers/food/food = product
food.filling_color = get_trait(TRAIT_PRODUCT_COLOUR)
if(mysterious) if(mysterious)
product.name += "?" product.name += "?"

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

@@ -265,19 +265,17 @@
/mob/living/silicon/robot/drone/start_pulling(var/atom/movable/AM) /mob/living/silicon/robot/drone/start_pulling(var/atom/movable/AM)
if(istype(AM,/obj/item/pipe) || istype(AM,/obj/structure/disposalconstruct)) if(!(istype(AM,/obj/item/pipe) || istype(AM,/obj/structure/disposalconstruct)))
..() if(istype(AM,/obj/item))
else if(istype(AM,/obj/item)) var/obj/item/O = AM
var/obj/item/O = AM if(O.w_class > can_pull_size)
if(O.w_class > can_pull_size) src << "<span class='warning'>You are too small to pull that.</span>"
src << "<span class='warning'>You are too small to pull that.</span>" return
return
else else
..() if(!can_pull_mobs)
else src << "<span class='warning'>You are too small to pull that.</span>"
if(!can_pull_mobs) return
src << "<span class='warning'>You are too small to pull that.</span>" ..()
return
/mob/living/silicon/robot/drone/add_robot_verbs() /mob/living/silicon/robot/drone/add_robot_verbs()
src.verbs |= silicon_subsystems src.verbs |= silicon_subsystems