From c1eeea9efcfebb1a27ae0ff4e15745777a14fc1e Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 26 Apr 2021 14:03:40 -0400 Subject: [PATCH] Exploration Balance Tweaks - Removes the Pathfinder's Frontier Carbine - Removes the Pathfinder's Binoculars - Adds the Frontier Carbine to the Survery Vendor, for 750 points. It has improved stats over a normal Frontier Phaser - Adds binoculars to the survey vendor for 40 points - Adds a Frontier Rifle, adminbus only for now - Renames some frontier phaser sprites for additional clarity - Adds two frontier holdout phasers to the exploration weapons locker --- code/datums/uplink/visible_weapons_vr.dm | 14 ++++- .../crates_lockers/closets/misc_vr.dm | 1 - .../ore_redemption_machine/survey_vendor.dm | 2 + .../projectiles/guns/energy/laser_vr.dm | 56 ++++++++++++++++-- icons/obj/gun_vr.dmi | Bin 54177 -> 54193 bytes maps/tether/tether-06-station2.dmm | 1 - maps/tether/tether_things.dm | 2 + maps/tether_better/tether_things.dm | 2 + 8 files changed, 70 insertions(+), 8 deletions(-) diff --git a/code/datums/uplink/visible_weapons_vr.dm b/code/datums/uplink/visible_weapons_vr.dm index d8df7d15eb..764e30b12f 100644 --- a/code/datums/uplink/visible_weapons_vr.dm +++ b/code/datums/uplink/visible_weapons_vr.dm @@ -2,11 +2,21 @@ * Highly Visible and Dangerous Weapons * ***************************************/ /datum/uplink_item/item/visible_weapons/holdout - name = "Holdout Phaser" + name = "Frontier Holdout" item_cost = 30 path = /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked /datum/uplink_item/item/visible_weapons/frontier - name = "Frontier Carbine" + name = "Frontier Phaser" item_cost = 75 + path = /obj/item/weapon/gun/energy/locked/frontier/unlocked + +/datum/uplink_item/item/visible_weapons/carbine + name = "Frontier Carbine" + item_cost = 85 path = /obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked + +/datum/uplink_item/item/visible_weapons/rifle + name = "Frontier Marksman Rifle" + item_cost = 100 + path = /obj/item/weapon/gun/energy/locked/frontier/rifle/unlocked diff --git a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm index 4b6c275a1a..6be3942fd7 100644 --- a/code/game/objects/structures/crates_lockers/closets/misc_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/misc_vr.dm @@ -176,7 +176,6 @@ /obj/item/stack/marker_beacon/thirty, /obj/item/weapon/material/knife/tacknife/survival, /obj/item/weapon/material/knife/machete/deluxe, - /obj/item/weapon/gun/energy/locked/frontier/carbine, /obj/item/clothing/accessory/holster/machete, /obj/random/explorer_shield, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 9956084c11..0d15c5675a 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -52,6 +52,7 @@ EQUIPMENT("Defense Equipment - Plasteel Machete", /obj/item/weapon/material/knife/machete, 50), EQUIPMENT("Defense Equipment - Razor Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/manhacks/station/locked, 100), EQUIPMENT("Defense Equipment - Sentry Drone Deployer", /obj/item/weapon/grenade/spawnergrenade/ward, 150), + EQUIPMENT("Defense Equipment - Frontier Carbine", /obj/item/weapon/gun/energy/locked/frontier/carbine, 750), EQUIPMENT("Fishing Net", /obj/item/weapon/material/fishing_net, 50), EQUIPMENT("Titanium Fishing Rod", /obj/item/weapon/material/fishing_rod/modern, 100), EQUIPMENT("Durasteel Fishing Rod", /obj/item/weapon/material/fishing_rod/modern/strong, 750), @@ -81,6 +82,7 @@ prize_list["Digging Tools"] = list( EQUIPMENT("Survey Tools - Shovel", /obj/item/weapon/shovel, 40), EQUIPMENT("Survey Tools - Mechanical Trap", /obj/item/weapon/beartrap, 50), + EQUIPMENT("Survey Tools - Binoculars", /obj/item/device/binoculars,40), ) prize_list["Miscellaneous"] = list( EQUIPMENT("Absinthe", /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe, 10), diff --git a/code/modules/projectiles/guns/energy/laser_vr.dm b/code/modules/projectiles/guns/energy/laser_vr.dm index 25cc30a41d..1dd5f12589 100644 --- a/code/modules/projectiles/guns/energy/laser_vr.dm +++ b/code/modules/projectiles/guns/energy/laser_vr.dm @@ -260,14 +260,15 @@ desc = "An ergonomically improved version of the venerable frontier phaser, the carbine is a fairly new weapon, and has only been produced in limited numbers so far. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility." description_fluff = "The NT Brand Model AT2 Secured Phaser System, a specialty phaser that has an intergrated chip that prevents the user from opperating the weapon within the vicinity of any NanoTrasen opperated outposts/stations/bases. However, this chip can be disabled so the weapon CAN BE used in the vicinity of any NanoTrasen opperated outposts/stations/bases. The weapon doesn't use traditional weapon power cells and instead works via a pump action that recharges the internal cells. It is a staple amongst exploration personell who usually don't have the license to opperate a lethal weapon through NT and provides them with a weapon that can be recharged away from civilization." icon = 'icons/obj/gun_vr.dmi' - icon_state = "carbkill" + icon_state = "carbinekill" item_state = "energykill" item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi') + phase_power = 150 - modifystate = "carbkill" + modifystate = "carbinekill" firemodes = list( - list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/blue, modifystate="carbkill", charge_cost = 300), - list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser/blue, modifystate="carbstun", charge_cost = 80), + list(mode_name="lethal", fire_delay=8, projectile_type=/obj/item/projectile/beam/blue, modifystate="carbinekill", charge_cost = 300), + list(mode_name="low-power", fire_delay=5, projectile_type=/obj/item/projectile/beam/weaklaser/blue, modifystate="carbinestun", charge_cost = 80), ) /obj/item/weapon/gun/energy/locked/frontier/carbine/update_icon() @@ -307,3 +308,50 @@ req_access = newlist() //for toggling safety locked = 0 lockable = 0 + +////////////////Phaser Rifle//////////////// + +/obj/item/weapon/gun/energy/locked/frontier/rifle + name = "frontier marksman rifle" + desc = "A much larger, heavier weapon than the typical frontier-type weapons, this DMR can be fired both from the hip, and in scope. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility." + icon = 'icons/obj/gun_vr.dmi' + icon_state = "riflekill" + item_state = "sniper" + item_state_slots = list(slot_r_hand_str = "lsniper", slot_l_hand_str = "lsniper") + wielded_item_state = "lsniper-wielded" + action_button_name = "Use Scope" + w_class = ITEMSIZE_LARGE + item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi') + accuracy = -15 //better than most snipers but still has penalty + scoped_accuracy = 40 + one_handed_penalty = 50 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand. + phase_power = 150 //efficient crank charger + + modifystate = "riflekill" + firemodes = list( + list(mode_name="sniper", fire_delay=35, projectile_type=/obj/item/projectile/beam/sniper, modifystate="riflekill", charge_cost = 600), + list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam, modifystate="riflestun", charge_cost = 200), + ) + +/obj/item/weapon/gun/energy/locked/frontier/rifle/ui_action_click() + scope() + +/obj/item/weapon/gun/energy/locked/frontier/rifle/verb/scope() + set category = "Object" + set name = "Use Scope" + set popup_menu = 1 + + toggle_scope(2.0) + +/obj/item/weapon/gun/energy/locked/frontier/rifle/update_icon() + if(recharging) + icon_state = "[modifystate]_pump" + update_held_icon() + return + ..() + +/obj/item/weapon/gun/energy/locked/frontier/rifle/unlocked + desc = "A much larger, heavier weapon than the typical frontier-type weapons, this DMR can be fired both from the hip, and in scope. Includes a built-in crank charger for recharging away from civilization." + req_access = newlist() //for toggling safety + locked = 0 + lockable = 0 diff --git a/icons/obj/gun_vr.dmi b/icons/obj/gun_vr.dmi index 626a0df097b4d1783759d1ad50009beb9975aec0..ecae15048111d4d53429096a22943bdd05d4aaec 100644 GIT binary patch delta 1432 zcmV;J1!wx9rvtI41CS(to_bVRbVOxyV{&P5bZKvH004NLt(s47<0u%$&&{W>X0FMq zPBPi;p@**8nXNRL9cd1Gw5UxmGBy_ASe;M52NOeDJ3O>iF0J%?U&F)u2V*`be?NSC z{E^)69~VceG?z_sn{5BMUR?FOFlBO^Y}Sjbl5$p>;U8^?p~-E3^68;&&GV2@A3{*O~+QYB_KOCpwoxkX8c` z|H>j!oRy{|O%YV_wXL9sDARZYd~|KmgQ~Sfk1#7;N@arN_cX<)^*v1^rlbwq0UI2{ zcGuw4iQu$nKEY(H}PO$R`KNy+g!lv>ktY)+jSM<&*pZDe+x z*+!<=nQb`Fw#zwNG{Gi}!dcd~TpJlq9m_=*!@(@J77kXirEsu{t%QSBc!AFL=hiBd zEe)5F6O0y09|u-YQLQ^gh0Lp{p~O|}H-ul@%VgYZaM*X(7^*U&)$KI6b$Pm8rpt7>o|8rcEPsz= zCJ%=gIvg+mP*N0>Fkl}sVA;(LO73@ml&QLANbc*J zA;m=345?1KW=ORos+F=?%^ccoUZnAa;VLgl!)D^-#@TO%GO*m(P3-2iubBfuZxHG9 zAl7k%a6fMljAphMhg-a3fe&XVHh)}-P9zdjBMb!A$O6$dvU4G}_CsPlVHoiYaJyC# zJskT-pooT!21Il)prV6;Om*;#zP$Vd!~zLne6EKwNk<5OE$2#Ii>tX`=W+U^0*7 z2Sn)TD`J3vt|JSmI4Fges-Xkt=&X4m*dk&tpFz|2%II8iU#5(YV53hI=&dahVoRl+-APy)9Z8kiF0J%?U&F)u2V*`bf8T$5 z_>tTl9+pR{G?z_slkEPuS}uBCm@>IZwwvXmq@0yz_(vOJXmXQ(e7dh&^ZaSKD7eze zO_DAbPm0uZ`1?e$uE~U>cGHv~nks-}U6U!$TbR@QH)UP3)}`W2m0n#1XLD}x=a)!> zFR@S9#6Dr>0h{Hbpn^OnH_2bC&1++(WFIqsreq&6d!}R`F?Xh9A2D;LWdFu_52C?= z!j$a8aHYdTuk@OK1}Q2!MwK>QgRG6Cft7JEur3Y;R>i@niIBRKhILJFEFKGu<(vHe_ z*12qH5gbv=Tgs4_vS5mW8x-84;4TOrcIj>Qui(d-sPM{vR=S$B%dqZy*rm4v3M`@r zhga~hOK-EUoe-$wubmJ`Pd18IRD~<(5N&G;=`hkYVL`U$T5}*@EeDQZq;n|*X*Ce> zuPhS9S!qhr6hReV+Y0&=Wg2gQkFG6xP_?$`5oWDRsZ5ako~HP;zNcx#l(b=cV1r}W z{tBEr5u7%ESm$sk(ncK(v{45GZPdX)8+CBlaZM_s5D zU$mRo{G!>s`WMaS*WsdBcsG5$3b@F)p*7GO&iQbEs7l_@aH$de1e-7lXIa~FZDcrgEEio22ea5(I9SD&!oe!G5)M}31v=ZGTdPdA zG+atX7%h}O4y>S}T6c;HnO9LmiL2Oe2*0?O$+*|xudf8PCvFj?Ex?KHS^dAeDpt8}%QlSczAf1k)q zK0U?I;duFnlA@r50sDvn%dW3ca=%B(ZTR5FlHqLmb@;Y^_yuC<*+$KvOw~0*a$naB zDJHsRNOjURL#iE7t(47r=Fo2YB8?{u*Lg`AHWMe;&VDyCR!ivIbq7FY`lUVVF8lEGc&m4MbyR|u6f9^@^F6L2X z5YCBugz{?y-w|u0i#NpjXbMEZhysx{qCm8cD3Ss>QIEW#u&kE-fPnP8MGX^_)zYA{ zmIlSOG^#Jubw}`>G5f|2IGTduf*pKBL0Qo)hg||#R?B`|%wo4EJQ$DJ2xTpe$1JLE zDMcYWgB^-EHqte6kmG3Ne}Kr*$ib7Nan~hs9O=U`nv^m}?&SG+ges-Xk^6W)4m*c3 z(PKX#6FqMc8iV=b(YV53o_jR#<(L+al+-APy$V_wksJfO-Ct?$b~Bp#v;JC zK<>sk8aY_>aOAks!;wQ!4@c5m&?8ky2903&E{l