From c536d62a6bb6402853c87e5a2c9fd991893d8207 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 12 Mar 2019 14:47:29 -0400 Subject: [PATCH 1/7] Prybar Icons Adds some icons as part of another port of a thing on VoreStation. These will allow you to use on an unpowered airlock but not much else. --- icons/obj/tools_vr.dmi | Bin 0 -> 548 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/obj/tools_vr.dmi diff --git a/icons/obj/tools_vr.dmi b/icons/obj/tools_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..72316467dd6c5edb25435954eaa2b0d235b992e0 GIT binary patch literal 548 zcmV+<0^9wGP)Z=s0J;SQnE(I{C@~X0 zN)$p+h-gZ!00001bW%=J06^y0W&i*Hi+WU8bVOxyV{&P5bZKvH004NLQ&wmb+GAXf0 ziHkEOv#1y-V93RpR+N~V3Spxui%%~~P0b@#abjswYEgP-UMjH~ic(XERhpDjiqlwS z1y?^8a9{uc*>+KN+ZT@p00030Nklh7PiW`F`%_~lX? zgaX+3`KB>|mERiRG=5us>CL}f7m6P^z6j#q?t$P>5~VMHjZymYS5XX3;VX5(M+PDr z$A<=S+bDi^fNzji4gv9@wDlbt8XEdrp$>!XKv0JPI}pfM8wA{e82HeiFmSu!fJqp* z{b4!4);o}M`1KCtEPkVYoS#za%Rin+qP|}PKQVld`2-%VAD6%EYzBTSzBuIFQC+@7 m&OiKtByRo<;_?p-QF;N3lnAX*FxN2v0000 Date: Wed, 13 Mar 2019 13:52:54 -0400 Subject: [PATCH 2/7] Add Prybars to Autolathes Non-emergency ability to print off additional prybars if one's dumb enough to toss out their emergency box after spawning in. --- code/datums/autolathe/tools.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/datums/autolathe/tools.dm b/code/datums/autolathe/tools.dm index 70ea299ec8..ce9133f088 100644 --- a/code/datums/autolathe/tools.dm +++ b/code/datums/autolathe/tools.dm @@ -42,3 +42,8 @@ /datum/category_item/autolathe/tools/welder_industrial name = "industrial welding tool" path =/obj/item/weapon/weldingtool/largetank + +//TFF: Ports VoreStation edit, add printable prybars to autolathes +/datum/category_item/autolathe/tools/prybar + name = "prybar" + path =/obj/item/weapon/prybar From aa68936574633b47711fc92348ba70f6d6d6474c Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Wed, 13 Mar 2019 13:57:18 -0400 Subject: [PATCH 3/7] Add Prybars Include Prybars to Survival Boxes. Don't throw these away. You might need it if there's power issues. --- code/game/objects/items/weapons/storage/boxes.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 0a1f358eb4..03ec4d1331 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -57,6 +57,7 @@ desc = "A survival box issued to crew members for use in emergency situations." starts_with = list( /obj/item/clothing/glasses/goggles, //VOREStation Add - Goggles for the phoron atmosphere, + /obj/item/weapon/prybar/red, //TFF: Ports prybar addition from VoreStation /obj/item/clothing/mask/breath ) @@ -65,6 +66,7 @@ desc = "A survival box issued to synthetic crew members for use in emergency situations." starts_with = list( /obj/item/clothing/glasses/goggles //VOREStation Add - Goggles for the phoron atmosphere, + /obj/item/weapon/prybar/red, //TFF: Ports prybar addition from VoreStation ) /obj/item/weapon/storage/box/survival/comp @@ -73,6 +75,7 @@ icon_state = "survival" starts_with = list( /obj/item/clothing/glasses/goggles, //VOREStation Add - Goggles for the phoron atmosphere, + /obj/item/weapon/prybar/red, //TFF: Ports prybar addition from VoreStation /obj/item/weapon/reagent_containers/hypospray/autoinjector, /obj/item/stack/medical/bruise_pack, /obj/item/device/flashlight/glowstick, From d33629b097ea3aba6ea0450580ee8ed91b78f5eb Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Wed, 13 Mar 2019 13:59:46 -0400 Subject: [PATCH 4/7] Add Prybars Prybars can only be used on unpowered airlocks and emergency shutters if needed. Ported from VOREStation. --- code/game/objects/items/weapons/tools.dm | 29 ++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 9a8937adbc..0f79d8146e 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -978,6 +978,35 @@ user.put_in_active_hand(counterpart) to_chat(user, "You attach the cutting jaws to [src].") +//TFF: Add new tool, prybar, ported from VOREStation. +/obj/item/weapon/prybar + name = "pry bar" + desc = "A steel bar with a wedge, designed specifically for opening unpowered doors in an emergency. It comes in a variety of configurations - collect them all!" + icon = 'icons/obj/tools_vr.dmi' + icon_state = "prybar" + flags = CONDUCT + slot_flags = SLOT_BELT + force = 4 + throwforce = 5 + pry = 1 + item_state = "crowbar" + w_class = ITEMSIZE_SMALL + origin_tech = list(TECH_ENGINEERING = 1) + matter = list(DEFAULT_WALL_MATERIAL = 30) + attack_verb = list("whapped", "smacked", "swatted", "thwacked", "hit") + usesound = 'sound/items/crowbar.ogg' + toolspeed = 1 + var/random_color = TRUE + +/obj/item/weapon/prybar/red + icon_state = "prybar_red" + item_state = "crowbar_red" + random_color = FALSE + +/obj/item/weapon/prybar/New() + if(random_color) + icon_state = "prybar[pick("","_green","_aubergine","_blue")]" + . = ..() /*/obj/item/weapon/combitool name = "combi-tool" From eab6bc4a2fbe6272f05610c2b22ca7f9b88f55dc Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Wed, 13 Mar 2019 14:16:49 -0400 Subject: [PATCH 5/7] Dumb Commas Fixes a comma being in the wrong place. --- code/game/objects/items/weapons/storage/boxes.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 03ec4d1331..f0c0356651 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -65,8 +65,8 @@ name = "synthetic supply box" desc = "A survival box issued to synthetic crew members for use in emergency situations." starts_with = list( - /obj/item/clothing/glasses/goggles //VOREStation Add - Goggles for the phoron atmosphere, - /obj/item/weapon/prybar/red, //TFF: Ports prybar addition from VoreStation + /obj/item/clothing/glasses/goggles, //VOREStation Add - Goggles for the phoron atmosphere, + /obj/item/weapon/prybar/red //TFF: Ports prybar addition from VoreStation ) /obj/item/weapon/storage/box/survival/comp From d2686b11f06836877227b54677b3d70894330b96 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Wed, 13 Mar 2019 15:27:31 -0400 Subject: [PATCH 6/7] Travis, don't be a wuss. No indentations here. Force Travis to restart. --- code/game/objects/items/weapons/storage/boxes.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index f0c0356651..dc9b36b980 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -57,7 +57,7 @@ desc = "A survival box issued to crew members for use in emergency situations." starts_with = list( /obj/item/clothing/glasses/goggles, //VOREStation Add - Goggles for the phoron atmosphere, - /obj/item/weapon/prybar/red, //TFF: Ports prybar addition from VoreStation + /obj/item/weapon/prybar/red, //TFF: Ports prybar addition from VOREStation. /obj/item/clothing/mask/breath ) @@ -66,7 +66,7 @@ desc = "A survival box issued to synthetic crew members for use in emergency situations." starts_with = list( /obj/item/clothing/glasses/goggles, //VOREStation Add - Goggles for the phoron atmosphere, - /obj/item/weapon/prybar/red //TFF: Ports prybar addition from VoreStation + /obj/item/weapon/prybar/red //TFF: Ports prybar addition from VOREStation. ) /obj/item/weapon/storage/box/survival/comp @@ -75,7 +75,7 @@ icon_state = "survival" starts_with = list( /obj/item/clothing/glasses/goggles, //VOREStation Add - Goggles for the phoron atmosphere, - /obj/item/weapon/prybar/red, //TFF: Ports prybar addition from VoreStation + /obj/item/weapon/prybar/red, //TFF: Ports prybar addition from VOREStation. /obj/item/weapon/reagent_containers/hypospray/autoinjector, /obj/item/stack/medical/bruise_pack, /obj/item/device/flashlight/glowstick, From 7d1929f812c4907c93d0055882f36559b8c050a8 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Wed, 13 Mar 2019 16:26:17 -0400 Subject: [PATCH 7/7] Here are your damned commas, Travis --- code/game/objects/items/weapons/storage/boxes.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index dc9b36b980..096003a8f5 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -57,7 +57,7 @@ desc = "A survival box issued to crew members for use in emergency situations." starts_with = list( /obj/item/clothing/glasses/goggles, //VOREStation Add - Goggles for the phoron atmosphere, - /obj/item/weapon/prybar/red, //TFF: Ports prybar addition from VOREStation. + /obj/item/weapon/prybar/red, //TFF: Ports prybar addition from VOREStation, /obj/item/clothing/mask/breath ) @@ -66,7 +66,7 @@ desc = "A survival box issued to synthetic crew members for use in emergency situations." starts_with = list( /obj/item/clothing/glasses/goggles, //VOREStation Add - Goggles for the phoron atmosphere, - /obj/item/weapon/prybar/red //TFF: Ports prybar addition from VOREStation. + /obj/item/weapon/prybar/red //TFF: Ports prybar addition from VOREStation, ) /obj/item/weapon/storage/box/survival/comp @@ -75,7 +75,7 @@ icon_state = "survival" starts_with = list( /obj/item/clothing/glasses/goggles, //VOREStation Add - Goggles for the phoron atmosphere, - /obj/item/weapon/prybar/red, //TFF: Ports prybar addition from VOREStation. + /obj/item/weapon/prybar/red, //TFF: Ports prybar addition from VOREStation, /obj/item/weapon/reagent_containers/hypospray/autoinjector, /obj/item/stack/medical/bruise_pack, /obj/item/device/flashlight/glowstick,