cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10566 from mwerezak/runtime-fixes

Browse Source 
Runtime fixes
This commit is contained in:
Chinsky
2015-08-12 20:36:49 +03:00
parent 4db1a553f2 a62edc5b3a
commit c9de7ddd43
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/weapons/clown_items.dm
View File

@@ -32,7 +32,7 @@
else if(istype(target,/turf)) else if(istype(target,/turf))
user << "<span class='notice'>You scrub \the [target.name] clean.</span>" user << "<span class='notice'>You scrub \the [target.name] clean.</span>"
var/turf/T = target var/turf/T = target
T.clean() T.clean(src)
else else
user << "<span class='notice'>You clean \the [target.name].</span>" user << "<span class='notice'>You clean \the [target.name].</span>"
target.clean_blood() target.clean_blood()

1
code/game/objects/items/weapons/mop.dm
View File

@@ -16,6 +16,7 @@
/obj/item/weapon/mop/New() /obj/item/weapon/mop/New()
create_reagents(5) create_reagents(5)
//expects an atom containing the reagents used to clean the turf
/turf/proc/clean(atom/source) /turf/proc/clean(atom/source)
if(source.reagents.has_reagent("water", 1)) if(source.reagents.has_reagent("water", 1))
clean_blood() clean_blood()

2
code/modules/organs/organ_internal.dm
View File

@@ -79,7 +79,7 @@
owner.b_eyes ? owner.b_eyes : 0 owner.b_eyes ? owner.b_eyes : 0
) )
/obj/item/organ/eyes/take_damage() /obj/item/organ/eyes/take_damage(amount, var/silent=0)
var/oldbroken = is_broken() var/oldbroken = is_broken()
..() ..()
if(is_broken() && !oldbroken && owner && !owner.stat) if(is_broken() && !oldbroken && owner && !owner.stat)