This commit is contained in:
Zuhayr
2015-07-12 07:04:35 +09:30
parent ef7d13c3dd
commit c59dc2445c
2 changed files with 15 additions and 7 deletions

View File

@@ -414,6 +414,9 @@
"<span class='danger'>[user] was stunned by \his wet [O]!</span>", \ "<span class='danger'>[user] was stunned by \his wet [O]!</span>", \
"<span class='userdanger'>[user] was stunned by \his wet [O]!</span>") "<span class='userdanger'>[user] was stunned by \his wet [O]!</span>")
return return
// Short of a rewrite, this is necessary to stop monkeycubes being washed.
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
return
var/turf/location = user.loc var/turf/location = user.loc
if(!isturf(location)) return if(!isturf(location)) return

View File

@@ -1527,11 +1527,13 @@
..() ..()
reagents.add_reagent("protein", 10) reagents.add_reagent("protein", 10)
afterattack(obj/O as obj, mob/user as mob, proximity) afterattack(obj/O as obj, var/mob/living/carbon/human/user as mob, proximity)
if(!proximity) return if(!proximity) return
if(istype(O,/obj/structure/sink) && !wrapped) if(istype(O,/obj/structure/sink) && !wrapped)
user << "You place \the [name] under a stream of water..." user << "You place \the [name] under a stream of water..."
loc = get_turf(O) if(istype(user))
user.unEquip(src)
src.loc = get_turf(src)
return Expand() return Expand()
..() ..()
@@ -1576,11 +1578,14 @@
*/ */
proc/Expand() proc/Expand()
for(var/mob/M in viewers(src,7)) src.visible_message("<span class='notice'>\The [src] expands!</span>")
M << "\red \The [src] expands!" var/mob/living/carbon/human/H = new(src.loc)
var/mob/living/carbon/human/H = new (src)
H.set_species(monkey_type) H.set_species(monkey_type)
H.real_name = H.species.get_random_name()
H.name = H.real_name
src.loc = null
qdel(src) qdel(src)
return 1
proc/Unwrap(mob/user as mob) proc/Unwrap(mob/user as mob)
icon_state = "monkeycube" icon_state = "monkeycube"