cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 21:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

HONK! update

Browse Source 
Crayons
Clown and mime now spawn with crayons. This won't go horribly wrong.
 Soap
Added soap to the station. Basically a reskinned banana peel for now.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1530 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uporotiy
2011-05-04 23:13:38 +00:00
parent b74f67a3f9
commit e4d315863a
7 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/clown_items.dm
+14 -1
View File
@@ -2,6 +2,7 @@
CONTAINS:
NO MORE BANANA, NOW YOU CAN EAT IT. GO SEE OTHER FOOD STUFFS.
BANANA PEEL
SOAP
BIKE HORN
*/
@@ -13,7 +14,19 @@ BIKE HORN
return
M.pulling = null
M << "\blue You slipped on the banana peel!"
M << "\blue You slipped on the [name]!"
playsound(src.loc, 'slip.ogg', 50, 1, -3)
M.stunned = 8
M.weakened = 5
/obj/item/weapon/soap/HasEntered(AM as mob|obj) //EXACTLY the same as bananapeel for now, so it makes sense to put it in the same dm -- Urist
if (istype(AM, /mob/living/carbon))
var/mob/M = AM
if (istype(M, /mob/living/carbon/human) && (isobj(M:shoes) && M:shoes.flags&NOSLIP))
return
M.pulling = null
M << "\blue You slipped on the [name]!"
playsound(src.loc, 'slip.ogg', 50, 1, -3)
M.stunned = 8
M.weakened = 5
code/game/objects/items/weapons/mops_cleaners.dm
+2
View File
@@ -73,6 +73,8 @@ MOP
A.clean_blood()
for(var/obj/rune/R in A)
del(R)
for(var/obj/crayonrune/R in A)
del(R)
mopcount++
else if (istype(A, /obj/decal/cleanable/blood) || istype(A, /obj/overlay) || istype(A, /obj/decal/cleanable/xenoblood) || istype(A, /obj/rune) || istype(A,/obj/crayonrune) )
for(var/mob/O in viewers(user, null))