cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-27 06:36:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #750 from SierraKomodo/Custom-Items---10/24

Browse Source 
Custom items 10 24
This commit is contained in:
SoundScopes
2015-10-26 12:43:21 +00:00
parent 7d779cecf0 c35174f8f2
commit e058895be0
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+37 -2
View File
@@ -25,7 +25,8 @@
"/obj/item/weapon/airlock_electronics",
"/obj/item/weapon/module/power_control",
"/obj/item/weapon/cell",
"/obj/item/weapon/hand_tele")
"/obj/item/weapon/hand_tele",
"/obj/item/weapon/soap/fluff/jace_toothbrush")
storage_slots = 14
max_combined_w_class = 42
max_w_class = 3
@@ -1323,4 +1324,38 @@ END R I P HAZERI
slot_flags = SLOT_MASK
/obj/item/clothing/tie/fluff/fortune_shieldpendant/New()
inv_overlay = image("icon" = 'icons/obj/custom_items/fortune_shieldpendant.dmi', "icon_state" = "fortune_shieldpendant_w")
inv_overlay = image("icon" = 'icons/obj/custom_items/fortune_shieldpendant.dmi', "icon_state" = "fortune_shieldpendant_w")
// Jace Evan's toothbrush - Wittly
/obj/item/weapon/soap/fluff/jace_toothbrush
name = "toothbrush"
desc = "An old toothbrush. It looks well used."
icon = 'icons/obj/custom_items/jace_toothbrush.dmi'
icon_state = "jace_toothbrush"
var/cleanspeed = 20
/obj/item/weapon/soap/fluff/jace_toothbrush/Crossed(AM as mob|obj)
return
/obj/item/weapon/soap/fluff/jace_toothbrush/afterattack(atom/target, mob/user as mob, proximity)
if(!proximity) return
if(user.client && (target in user.client.screen))
return
if (istype(target,/obj/effect/decal/cleanable))
user.visible_message("<span class='warning'>[user] begins to scrub \the [target.name] out with [src].</span>")
if(do_after(user, src.cleanspeed) && target)
user << "<span class='notice'>You scrub \the [target.name] out.</span>"
del(target)
else
user.visible_message("<span class='warning'>[user] begins to clean \the [target.name] with [src].</span>")
if(do_after(user, src.cleanspeed))
user << "<span class='notice'>You clean \the [target.name].</span>"
var/obj/effect/decal/cleanable/C = locate() in target
del(C)
target.clean_blood()
return
/obj/item/weapon/soap/fluff/jace_toothbrush/attack(mob/target as mob, mob/user as mob)
return