diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index 42789dc55b..e61cfd6418 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -98,6 +98,8 @@ /obj/item/weapon/storage/survival_kit/engineer name = "Centcom Engineer Kit" +/obj/item/weapon/storage/box/syndicate + /obj/item/weapon/storage/pillbottlebox name = "pill bottles" desc = "A box of pill bottles." diff --git a/code/game/objects/devices/PDA/uplink.dm b/code/game/objects/devices/PDA/uplink.dm index 5f33623e3b..ba9475c7af 100644 --- a/code/game/objects/devices/PDA/uplink.dm +++ b/code/game/objects/devices/PDA/uplink.dm @@ -63,7 +63,8 @@ menu_message += "
" menu_message += "Syndicate Toolbox (Includes various tools) (1)
" menu_message += "Syndicate Balloon (Useless) (10)
" - + menu_message += "
" + menu_message += "Syndicate Bundle (Contains an assorted selection of syndicate items)(10)
" menu_message += "
" return @@ -196,6 +197,10 @@ if(uses >= 10) uses -= 10 new /obj/item/toy/syndicateballoon(get_turf(hostpda)) + if("bundle") + if(uses >= 10) + uses -= 10 + new /obj/item/weapon/storage/box/syndicate(get_turf(hostpda)) generate_menu() print_to_host(menu_message) diff --git a/code/game/objects/storage/storage.dm b/code/game/objects/storage/storage.dm index 22ec29167e..79f96d15ab 100644 --- a/code/game/objects/storage/storage.dm +++ b/code/game/objects/storage/storage.dm @@ -215,6 +215,50 @@ new /obj/item/weapon/tank/emergency_oxygen/engi( src ) return +/obj/item/weapon/storage/box/syndicate/New() + ..() + switch (pickweight(list("bloodyspai" = 1, "stealth" = 1, "screwed" = 1, "guns" = 1, "murder" = 1, "freedom" = 1))) + if ("bloodyspai") + new /obj/item/clothing/under/chameleon(src) + new /obj/item/clothing/mask/gas/voice(src) + new /obj/item/weapon/card/id/syndicate(src) + new /obj/item/clothing/shoes/syndigaloshes(src) + return + + if ("stealth") + new /obj/item/weapon/gun/energy/crossbow(src) + new /obj/item/weapon/pen/sleepypen(src) + new /obj/item/device/chameleon(src) + return + + if ("screwed") + new /obj/spawner/newbomb/timer/syndicate(src) + new /obj/spawner/newbomb/timer/syndicate(src) + new /obj/item/device/powersink(src) + new /obj/item/clothing/suit/space/syndicate(src) + new /obj/item/clothing/head/helmet/space/syndicate(src) + return + + if ("guns") + new /obj/item/weapon/gun/projectile(src) + new /obj/item/ammo_magazine(src) + new /obj/item/weapon/card/emag(src) + new /obj/item/weapon/plastique(src) + return + + if ("murder") + new /obj/item/weapon/melee/energy/sword(src) + new /obj/item/weapon/cloaking_device(src) + new /obj/item/weapon/card/emag(src) + return + + if("freedom") + var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src) + O.imp = new /obj/item/weapon/implant/freedom(O) + var/obj/item/weapon/implanter/U = new /obj/item/weapon/implanter(src) + U.imp = new /obj/item/weapon/implant/uplink(U) + return + /obj/item/weapon/storage/dice/New() new /obj/item/weapon/dice( src ) new /obj/item/weapon/dice/d20( src ) diff --git a/icons/changelog.html b/icons/changelog.html index 0c30ff5e7c..b0ca0a17e6 100644 --- a/icons/changelog.html +++ b/icons/changelog.html @@ -45,7 +45,22 @@ Stuff which is in development and not yet visible to players or just code relate (is. code improvements for expandability, etc.) should not be listed here. They should be listed in the changelog upon commit tho. Thanks. --> -15 August 2011. +16 August 2011. +
    +
  • Superxpdude updated: +
      +
    • Traitor item bundles: Contains a random selection of traitor gear
    • +
    +
+ +
    +
  • Uhangi updated: +
      +
    • .38 Special Ammo can now be made from unhacked autolathes
    • +
    +
+ +15 August 2011.
  • Superxpdude updated: