From b69132bede3493b364ba448914b6ffb555000af7 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Thu, 31 Dec 2020 00:34:44 -0800 Subject: [PATCH 1/5] ports https://github.com/tgstation/tgstation/pull/52931 --- .../machinery/porta_turret/portable_turret.dm | 3 +++ .../objects/items/devices/traitordevices.dm | 22 +++++++++++++++++++ .../uplink/uplink_items/uplink_roles.dm | 7 ++++++ 3 files changed, 32 insertions(+) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 34745a65f6..29883a073a 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -774,6 +774,9 @@ stun_projectile_sound = 'sound/weapons/gunshot_smg.ogg' armor = list("melee" = 50, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 80, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90) +/obj/machinery/porta_turret/syndicate/pod/toolbox + max_integrity = 100 + /obj/machinery/porta_turret/syndicate/shuttle/target(atom/movable/target) if(target) setDir(get_dir(base, target))//even if you can't shoot, follow the target diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index eb444cdb12..ff02490388 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -264,6 +264,28 @@ effective or pretty fucking useless. GLOB.active_jammers -= src update_icon() +/obj/item/storage/toolbox/emergency/turret + desc = "You feel a strange urge to hit this with a wrench." + +/obj/item/storage/toolbox/emergency/turret/PopulateContents() + new /obj/item/screwdriver(src) + new /obj/item/wrench(src) + new /obj/item/weldingtool(src) + new /obj/item/crowbar(src) + new /obj/item/analyzer(src) + new /obj/item/wirecutters(src) + +/obj/item/storage/toolbox/emergency/turret/attackby(obj/item/I, mob/living/user, params) + if(I.tool_behaviour == TOOL_WRENCH && user.a_intent == INTENT_HARM) + user.visible_message("[user] bashes [src] with [I]!", \ + "You bash [src] with [I]!", null, COMBAT_MESSAGE_RANGE) + playsound(src, "sound/items/drill_use.ogg", 80, TRUE, -1) + var/obj/machinery/porta_turret/syndicate/pod/toolbox/turret = new(get_turf(loc)) + turret.faction = list("[REF(user)]") + qdel(src) + + ..() + /obj/item/headsetupgrader name = "headset upgrader" desc = "A tool that can be used to upgrade a normal headset to be able to protect from flashbangs." diff --git a/code/modules/uplink/uplink_items/uplink_roles.dm b/code/modules/uplink/uplink_items/uplink_roles.dm index b8eaf41371..a371f0434c 100644 --- a/code/modules/uplink/uplink_items/uplink_roles.dm +++ b/code/modules/uplink/uplink_items/uplink_roles.dm @@ -244,3 +244,10 @@ cost = 2 item = /obj/item/clothing/shoes/magboots/crushing restricted_roles = list("Chief Engineer", "Station Engineer", "Atmospheric Technician") + +/datum/uplink_item/role_restricted/turretbox + name = "Disposable Sentry Gun" + desc = "A disposable sentry gun deployment system cleverly disguised as a toolbox, apply wrench for functionality." + item = /obj/item/storage/toolbox/emergency/turret + cost = 11 + restricted_roles = list("Station Engineer") \ No newline at end of file From 67364f425491a32f89abb815f71115c3bedff504 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Wed, 6 Jan 2021 18:26:07 -0800 Subject: [PATCH 2/5] Update traitordevices.dm --- code/game/objects/items/devices/traitordevices.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index ff02490388..7f85042860 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -283,6 +283,7 @@ effective or pretty fucking useless. var/obj/machinery/porta_turret/syndicate/pod/toolbox/turret = new(get_turf(loc)) turret.faction = list("[REF(user)]") qdel(src) + return ..() From b5e8d3308c06befb4ff52971a2d391a7b9d60b32 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Wed, 6 Jan 2021 18:40:49 -0800 Subject: [PATCH 3/5] Update traitordevices.dm --- code/game/objects/items/devices/traitordevices.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 7f85042860..eaad7f88e2 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -264,6 +264,7 @@ effective or pretty fucking useless. GLOB.active_jammers -= src update_icon() +/*portable turret*/ /obj/item/storage/toolbox/emergency/turret desc = "You feel a strange urge to hit this with a wrench." From 21e81faff519df5ceefedaa8c7aa0128fc4e7c33 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Wed, 6 Jan 2021 18:48:02 -0800 Subject: [PATCH 4/5] Update traitordevices.dm --- code/game/objects/items/devices/traitordevices.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 7f85042860..c50ca838c5 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -283,7 +283,7 @@ effective or pretty fucking useless. var/obj/machinery/porta_turret/syndicate/pod/toolbox/turret = new(get_turf(loc)) turret.faction = list("[REF(user)]") qdel(src) - return + return ..() From a25af6ea0c221cadcb097fda06fb0f163258fb75 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Thu, 7 Jan 2021 16:53:09 -0800 Subject: [PATCH 5/5] Update uplink_roles.dm --- code/modules/uplink/uplink_items/uplink_roles.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/uplink/uplink_items/uplink_roles.dm b/code/modules/uplink/uplink_items/uplink_roles.dm index a371f0434c..52188fa0d9 100644 --- a/code/modules/uplink/uplink_items/uplink_roles.dm +++ b/code/modules/uplink/uplink_items/uplink_roles.dm @@ -250,4 +250,5 @@ desc = "A disposable sentry gun deployment system cleverly disguised as a toolbox, apply wrench for functionality." item = /obj/item/storage/toolbox/emergency/turret cost = 11 - restricted_roles = list("Station Engineer") \ No newline at end of file + restricted_roles = list("Station Engineer") +