diff --git a/code/defines/obj/toy.dm b/code/defines/obj/toy.dm index e96b0f8707d..bbcd0baf2d7 100644 --- a/code/defines/obj/toy.dm +++ b/code/defines/obj/toy.dm @@ -291,6 +291,11 @@ obj/item/toy/blink colour = "DA00FF" shadeColour = "810CFF" +/obj/item/toy/crayon/mime + icon_state = "crayonmime" + colour = "FFFFFF" + shadeColour = "000000" + /obj/item/toy/crayon/afterattack(atom/target, mob/user as mob) if(istype(target,/turf/simulated/floor)) new /obj/crayonrune(target,colour,shadeColour) @@ -301,6 +306,7 @@ obj/item/toy/blink name = "rune" desc = "A rune drawn in crayon." icon = 'rune.dmi' + layer = 2.1 /obj/crayonrune/New(location,main = "FFFFFF",shade = "000000") ..() @@ -310,7 +316,7 @@ obj/item/toy/blink var/icon/mainOverlay = new/icon('rune.dmi',"main[runeShape]",2.1) mainOverlay.Blend("#[main]",ICON_ADD) - var/icon/shadeOverlay = new/icon('rune.dmi',"shade[runeShape]",3) + var/icon/shadeOverlay = new/icon('rune.dmi',"shade[runeShape]",2.1) shadeOverlay.Blend("#[shade]",ICON_ADD) overlays += mainOverlay diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index e28fc2fbc5a..dc9a37834ac 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -262,6 +262,24 @@ throw_speed = 4 throw_range = 20 +/obj/item/weapon/soap + name = "Soap" + desc = "A cheap bar of soap. Doesn't smell." + icon = 'items.dmi' + icon_state = "soap" + w_class = 1.0 + throwforce = 0 + throw_speed = 4 + throw_range = 20 + +/obj/item/weapon/soap/nanotrasen + desc = "A Nanotrasen brand bar of soap. Smells of plasma." + icon_state = "soapnt" + +/obj/item/weapon/soap/deluxe + desc = "A deluxe Waffle Co. brand bar of soap. Smells of comdoms." + icon_state = "soapdeluxe" + /obj/item/weapon/baton name = "Stun Baton" desc = "A stun baton for hitting people with." diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index 8afa4a01c7c..387d9dc0ccb 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -339,6 +339,7 @@ src.equip_if_possible(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(src), slot_in_backpack) src.equip_if_possible(new /obj/item/weapon/bikehorn(src), slot_in_backpack) src.equip_if_possible(new /obj/item/weapon/stamp/clown(src), slot_in_backpack) + src.equip_if_possible(new /obj/item/toy/crayonbox(src), slot_in_backpack) src.mutations |= 16 if ("Mime") @@ -350,6 +351,7 @@ src.equip_if_possible(new /obj/item/clothing/mask/gas/mime(src), slot_wear_mask) src.equip_if_possible(new /obj/item/clothing/head/beret(src), slot_head) src.equip_if_possible(new /obj/item/clothing/suit/suspenders(src), slot_wear_suit) + src.equip_if_possible(new /obj/item/toy/crayon/mime(src), slot_in_backpack) src.verbs += /client/proc/mimespeak src.verbs += /client/proc/mimewall src.mind.special_verbs += /client/proc/mimespeak diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 2c88d0cc12c..fb2bd6b6d41 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -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 diff --git a/code/game/objects/items/weapons/mops_cleaners.dm b/code/game/objects/items/weapons/mops_cleaners.dm index ff18449ee24..86faaa01051 100644 --- a/code/game/objects/items/weapons/mops_cleaners.dm +++ b/code/game/objects/items/weapons/mops_cleaners.dm @@ -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)) diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 8f0f542ac5c..57519159455 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index fee14cbcc20..06033b8231a 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ