diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index db07b6d9863..45c6766a03e 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -120,7 +120,7 @@ synd_mob.equip_if_possible(new /obj/item/clothing/suit/armor/vest(synd_mob), synd_mob.slot_wear_suit) synd_mob.equip_if_possible(new /obj/item/clothing/gloves/swat(synd_mob), synd_mob.slot_gloves) synd_mob.equip_if_possible(new /obj/item/clothing/head/helmet/swat(synd_mob), synd_mob.slot_head) - + synd_mob.equip_if_possible(new /obj/item/weapon/card/id/syndicate(synd_mob), synd_mob.slot_wear_id) synd_mob.equip_if_possible(new /obj/item/weapon/storage/backpack(synd_mob), synd_mob.slot_back) synd_mob.equip_if_possible(new /obj/item/weapon/ammo/a357(synd_mob), synd_mob.slot_in_backpack) synd_mob.equip_if_possible(new /obj/item/weapon/reagent_containers/pill/tox(synd_mob), synd_mob.slot_in_backpack) diff --git a/code/game/objects/devices/PDA/uplink.dm b/code/game/objects/devices/PDA/uplink.dm index 02bfe39829c..3fa00db07ed 100644 --- a/code/game/objects/devices/PDA/uplink.dm +++ b/code/game/objects/devices/PDA/uplink.dm @@ -30,7 +30,7 @@ src.menu_message += "Request item:
" src.menu_message += "Each item costs a number of tele-crystals as indicated by the number following their name.
" src.menu_message += "
" - src.menu_message += "Revolver (7)
" + src.menu_message += "Revolver (6)
" src.menu_message += "Ammo-357 for use with Revolver (2)
" src.menu_message += "Energy Crossbow (5)
" src.menu_message += "Energy Sword (4)
" @@ -44,7 +44,7 @@ src.menu_message += "Sleepy Pen (5)
" src.menu_message += "
" src.menu_message += "Detomatix Cartridge (3)
" - src.menu_message += "Plastic Explosives (4)
" + src.menu_message += "Plastic Explosives (2)
" src.menu_message += "Power Sink (5)
" src.menu_message += "Syndicate-made Space Suit (inludes a helmet) (3)
" src.menu_message += "
" @@ -81,8 +81,8 @@ if (href_list["buy_item"]) switch(href_list["buy_item"]) if("revolver") - if (src.uses >= 7) - src.uses -= 7 + if (src.uses >= 6) + src.uses -= 6 var/obj/item/weapon/gun/revolver/O = new /obj/item/weapon/gun/revolver(get_turf(src.hostpda)) O.bullets = 7 if("revolver_ammo") @@ -139,9 +139,8 @@ src.uses -= 4 new /obj/item/weapon/sword(get_turf(src.hostpda)) if("bomb") - if (src.uses >= 4) - src.uses -= 4 - new /obj/item/weapon/plastique(get_turf(src.hostpda)) + if (src.uses >= 2) + src.uses -= 2 new /obj/item/weapon/plastique(get_turf(src.hostpda)) if("powersink") if (src.uses >= 5) diff --git a/code/game/objects/items/weapons/uplinks.dm b/code/game/objects/items/weapons/uplinks.dm index eedd0edf525..c3ed7de00b4 100644 --- a/code/game/objects/items/weapons/uplinks.dm +++ b/code/game/objects/items/weapons/uplinks.dm @@ -28,23 +28,33 @@ SYNDICATE UPLINK dat += "
" dat += "Request item:
" dat += "Each item costs a number of tele-crystals as indicated by the number following their name.
" - dat += "Revolver (7)
" - dat += "Ammo-357 for use with Revolver (2)
" - dat += "Energy Crossbow (5)
" - dat += "5 EMP Grenades (4)
" - dat += "Voice-Changer (4)
" - dat += "Chameleon Jumpsuit (3)
" - dat += "Syndicate Card (3)
" - dat += "Electromagnet Card (3)
" - dat += "Freedom Implant (with injector) (3)
" - dat += "Sleepy Pen (4)
" - dat += "Cloaking Device (4)
" - dat += "Energy Sword (4)
" - dat += "Syndicate Bomb (4)
" - dat += "Power Sink (5)
" - dat += "Detomatix Cartridge (3)" - dat += "Syndicate-made Space Suit (inludes a helmet) (3)
" - dat += "Binary Translator (3)
" + dat += "
" + dat += "Revolver (6)
" + dat += "Ammo-357 for use with Revolver (2)
" + dat += "Energy Crossbow (5)
" + dat += "Energy Sword (4)
" + dat += "
" + dat += "Chameleon Jumpsuit (3)
" + dat += "Syndicate Card (3)
" + dat += "Voice-Changer (4)
" + dat += "
" + dat += "Freedom Implant (with injector) (3)
" + dat += "Paralysis Pen (3)
" + dat += "Sleepy Pen (5)
" + dat += "
" + dat += "Detomatix Cartridge (3)
" + dat += "Plastic Explosives (2)
" + dat += "Power Sink (5)
" + dat += "Syndicate-made Space Suit (inludes a helmet) (3)
" + dat += "
" + dat += "Chameleon-projector (4)
" + dat += "Cloaking Device (4)
" + dat += "Electromagnet Card (3)
" + dat += "5 EMP Grenades (4)
" + dat += "
" + dat += "Binary Translator (3)
" + dat += "Hacked AI Module (7)
" + dat += "
" if (src.origradio) dat += "Lock
" @@ -63,79 +73,94 @@ SYNDICATE UPLINK return 1 if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf)))) usr.machine = src - if (href_list["item_emag"]) - if (src.uses >= 3) - src.uses -= 3 - new /obj/item/weapon/card/emag( H.loc ) - else if (href_list["item_empbox"]) - if (src.uses >= 4) - src.uses -= 4 - new /obj/item/weapon/storage/emp_kit( H.loc ) - else if (href_list["item_sleepypen"]) - if (src.uses >= 4) - src.uses -= 4 - new /obj/item/weapon/pen/sleepypen( H.loc ) - else if (href_list["item_cloak"]) - if (src.uses >= 4) - src.uses -= 4 - new /obj/item/weapon/cloaking_device( H.loc ) - else if (href_list["item_revolver"]) - if (src.uses >= 7) - src.uses -= 7 - var/obj/item/weapon/gun/revolver/O = new /obj/item/weapon/gun/revolver(H.loc) - O.bullets = 7 - else if (href_list["item_xbow"]) - if (src.uses >= 5) - src.uses -= 5 - new /obj/item/weapon/gun/energy/crossbow( H.loc ) - else if (href_list["item_revolver_ammo"]) - if (src.uses >= 2) - src.uses -= 2 - new /obj/item/weapon/ammo/a357(H.loc) - else if (href_list["item_voice"]) - if (src.uses >= 4) - src.uses -= 4 - new /obj/item/clothing/mask/gas/voice(H.loc) - else if (href_list["item_jump"]) - if (src.uses >= 3) - src.uses -= 3 - new /obj/item/clothing/under/chameleon(H.loc) - else if (href_list["item_imp_freedom"]) - if (src.uses >= 3) - src.uses -= 3 - var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(H.loc) - O.imp = new /obj/item/weapon/implant/freedom(O) - src.temp = "The implant is triggered by an emote and has a random amount of uses." - else if (href_list["item_bomb"]) - if (src.uses >= 4) - src.uses -= 4 - new /obj/item/weapon/plastique(H.loc) - new /obj/item/weapon/plastique(H.loc) - else if (href_list["item_card"]) - if (src.uses >= 3) - src.uses -= 3 - new /obj/item/weapon/card/id/syndicate(H.loc) - else if (href_list["item_sword"]) - if (src.uses >= 4) - src.uses -= 4 - new /obj/item/weapon/sword(H.loc) - else if (href_list["item_cartridge"]) - if (src.uses >= 3) - src.uses -= 3 - new /obj/item/weapon/cartridge/syndicate(H.loc) - else if (href_list["item_powersink"]) - if (src.uses >= 5) - src.uses -= 5 - new /obj/item/device/powersink(H.loc) - else if(href_list["item_space"]) - if (src.uses >= 3) - src.uses -= 3 - new /obj/item/clothing/suit/space/syndicate(H.loc) - new /obj/item/clothing/head/helmet/space/syndicate(H.loc) - else if(href_list["item_botchat"]) - if (src.uses >= 3) - src.uses -= 3 - new /obj/item/device/radio/headset/traitor(H.loc) + if (href_list["buy_item"]) + switch(href_list["buy_item"]) + if("revolver") + if (src.uses >= 6) + src.uses -= 6 + var/obj/item/weapon/gun/revolver/O = new /obj/item/weapon/gun/revolver(get_turf(src)) + O.bullets = 7 + if("revolver_ammo") + if (src.uses >= 2) + src.uses -= 2 + new /obj/item/weapon/ammo/a357(get_turf(src)) + if("xbow") + if (src.uses >= 5) + src.uses -= 5 + new /obj/item/weapon/gun/energy/crossbow(get_turf(src)) + if("empbox") + if (src.uses >= 4) + src.uses -= 4 + new /obj/item/weapon/storage/emp_kit(get_turf(src)) + if("voice") + if (src.uses >= 4) + src.uses -= 4 + new /obj/item/clothing/mask/gas/voice(get_turf(src)) + if("jump") + if (src.uses >= 3) + src.uses -= 3 + new /obj/item/clothing/under/chameleon(get_turf(src)) + if("card") + if (src.uses >= 3) + src.uses -= 3 + new /obj/item/weapon/card/id/syndicate(get_turf(src)) + if("emag") + if (src.uses >= 3) + src.uses -= 3 + new /obj/item/weapon/card/emag(get_turf(src)) + if("imp_freedom") + if (src.uses >= 3) + src.uses -= 3 + var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(get_turf(src)) + O.imp = new /obj/item/weapon/implant/freedom(O) + if("sleepypen") + if (src.uses >= 5) + src.uses -= 5 + new /obj/item/weapon/pen/sleepypen(get_turf(src)) + if("paralysispen") + if (src.uses >= 3) + src.uses -= 3 + new /obj/item/device/flashlight/pen/paralysis(get_turf(src)) + if("projector") + if (src.uses >= 4) + src.uses -= 4 + new /obj/item/device/chameleon(get_turf(src)) + if("cloak") + if (src.uses >= 4) + var/choice = input("Spawning a cloak in nuke is generally regarded as entirely dumb, are you sure?") in list("Confirm", "Abort") + if(choice == "Confirm") + if (src.uses >= 4) + src.uses -= 4 + new /obj/item/weapon/cloaking_device(get_turf(src)) + if("sword") + if (src.uses >= 4) + src.uses -= 4 + new /obj/item/weapon/sword(get_turf(src)) + if("bomb") + if (src.uses >= 2) + src.uses -= 2 + new /obj/item/weapon/plastique(get_turf(src)) + if("powersink") + if (src.uses >= 5) + src.uses -= 5 + new /obj/item/device/powersink(get_turf(src)) + if("detomatix") + if (src.uses >= 3) + src.uses -= 3 + new /obj/item/weapon/cartridge/syndicate(get_turf(src)) + if("space") + if (src.uses >= 3) + src.uses -= 3 + new /obj/item/clothing/suit/space/syndicate(get_turf(src)) + new /obj/item/clothing/head/helmet/space/syndicate(get_turf(src)) + if("lawmod") + if (src.uses >= 7) + src.uses -= 7 + new /obj/item/weapon/aiModule/syndicate(get_turf(src)) + if("botchat") + if (src.uses >= 3) + src.uses -= 3 + new /obj/item/device/radio/headset/traitor(get_turf(src)) else if (href_list["lock"] && src.origradio) // presto chango, a regular radio again! (reset the freq too...) usr.machine = null diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index f6da9ce8bd4..f1701f4234f 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -219,17 +219,19 @@ if (src.stat != 2) src.bruteloss += 60 src.updatehealth() + return /* else if (flag == PROJECTILE_MEDBULLET) if (src.stat != 2) src.bruteloss += 30 src.updatehealth() - +*/ else if (flag == PROJECTILE_WEAKBULLET) if (src.stat != 2) src.bruteloss += 15 src.updatehealth() - + return +/* else if (flag == PROJECTILE_MPBULLET) if (src.stat != 2) src.bruteloss += 20 @@ -247,6 +249,9 @@ */ else if (flag == PROJECTILE_TASER) + if (src.stat != 2) + src.bruteloss += rand(1,10) + src.stunned += rand(0,3) return else if (flag == PROJECTILE_DART) if (src.stat != 2)