diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index a55a2b4f737..8ac63df7061 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -259,6 +259,10 @@ desc = "A deluxe Waffle Co. brand bar of soap. Smells of comdoms." icon_state = "soapdeluxe" +/obj/item/weapon/soap/syndie + desc = "An untrustworthy bar of soap. Smells of fear." + icon_state = "soapsyndie" + /obj/item/weapon/bedsheet name = "bedsheet" desc = "Nice, linen, bedsheet. Perfect to put on." diff --git a/code/game/objects/devices/PDA/uplink.dm b/code/game/objects/devices/PDA/uplink.dm index ba9475c7af5..cf425009637 100644 --- a/code/game/objects/devices/PDA/uplink.dm +++ b/code/game/objects/devices/PDA/uplink.dm @@ -62,6 +62,7 @@ menu_message += "Singularity Beacon (does not include a screwdriver) (7)
" menu_message += "
" menu_message += "Syndicate Toolbox (Includes various tools) (1)
" + menu_message += "Syndicate Soap (1)
" menu_message += "Syndicate Balloon (Useless) (10)
" menu_message += "
" menu_message += "Syndicate Bundle (Contains an assorted selection of syndicate items)(10)
" @@ -193,6 +194,10 @@ if(uses) uses-- new /obj/item/weapon/storage/toolbox/syndicate(get_turf(hostpda)) + if("soap") + if(uses) + uses-- + new /obj/item/weapon/soap/syndie(get_turf(src)) if("balloon") if(uses >= 10) uses -= 10 diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 444ca009034..4fa32349c00 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -46,7 +46,7 @@ BIKE HORN /obj/item/weapon/soap/afterattack(atom/target, mob/user as mob) if(istype(target,/obj/decal/cleanable)) del(target) - user << "\blue You scrub the [name] out." + user << "\blue You scrub the [target.name] out." else target.clean_blood() user << "\blue You clean the [target.name]." diff --git a/code/game/objects/items/weapons/uplinks.dm b/code/game/objects/items/weapons/uplinks.dm index 5db34ba51b1..1068f6c9461 100644 --- a/code/game/objects/items/weapons/uplinks.dm +++ b/code/game/objects/items/weapons/uplinks.dm @@ -62,6 +62,7 @@ SYNDICATE UPLINK dat += "Hacked AI Module (7)
" dat += "
" dat += "Syndicate Toolbox (Includes various tools) (1)
" + dat += "Syndicate Soap (1)
" dat += "Syndicate Balloon (Useless) (10)
" dat += "
" if (src.origradio) @@ -182,6 +183,10 @@ SYNDICATE UPLINK if(uses) uses-- new /obj/item/weapon/storage/toolbox/syndicate(get_turf(src)) + if("soap") + if(uses) + uses-- + new /obj/item/weapon/soap/syndie(get_turf(src)) if("balloon") if (src.uses >= 10) uses -= 10 diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 73abe7a6cc3..aaab1b1f4f8 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ