diff --git a/code/defines/obj/toy.dm b/code/defines/obj/toy.dm index 6fc215620d1..c009061195f 100644 --- a/code/defines/obj/toy.dm +++ b/code/defines/obj/toy.dm @@ -4,6 +4,18 @@ throw_range = 20 force = 0 +/obj/item/toy/syndicateballoon + name = "syndicate balloon" + desc = "There is a tag on the back that reads \"FUK NT!11!\"." + throwforce = 0 + throw_speed = 4 + throw_range = 20 + force = 0 + icon = 'weapons.dmi' + icon_state = "syndballoon" + item_state = "syndballoon" + w_class = 4.0 + obj/item/toy/blink name = "electronic blink toy game" desc = "Blink. Blink. Blink. Ages 8 and up." diff --git a/code/game/objects/devices/PDA/uplink.dm b/code/game/objects/devices/PDA/uplink.dm index 05581d036ea..8e92385da75 100644 --- a/code/game/objects/devices/PDA/uplink.dm +++ b/code/game/objects/devices/PDA/uplink.dm @@ -62,6 +62,8 @@ menu_message += "Singularity Beacon (does not include a screwdriver) (3)
" menu_message += "
" menu_message += "Syndicate Toolbox (Includes various tools) (1)
" + menu_message += "Syndicate Balloon (10)
" + menu_message += "
" return @@ -190,6 +192,10 @@ if(uses) uses-- new /obj/item/weapon/storage/toolbox/syndicate(get_turf(hostpda)) + if("balloon") + if(uses >= 10) + uses -= 10 + new /obj/item/toy/syndicateballoon(get_turf(hostpda)) generate_menu() print_to_host(menu_message) diff --git a/code/game/objects/items/weapons/uplinks.dm b/code/game/objects/items/weapons/uplinks.dm index 99a9430a55a..185249b0025 100644 --- a/code/game/objects/items/weapons/uplinks.dm +++ b/code/game/objects/items/weapons/uplinks.dm @@ -62,7 +62,7 @@ SYNDICATE UPLINK dat += "Hacked AI Module (7)
" dat += "
" dat += "Syndicate Toolbox (Includes various tools) (1)
" - + dat += "Syndicate Balloon (10)
" dat += "
" if (src.origradio) dat += "Lock
" @@ -182,6 +182,10 @@ SYNDICATE UPLINK if(uses) uses-- new /obj/item/weapon/storage/toolbox/syndicate(get_turf(src)) + if("balloon") + if (src.uses >= 10) + uses -= 10 + new /obj/item/toy/syndicateballoon(get_turf(src)) else if (href_list["lock"] && src.origradio) // presto chango, a regular radio again! (reset the freq too...) shutdown_uplink() diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 159c86f6996..9f8cf6b29de 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ