From 26f0741a6f5a31b7be9cfc66d151d12d0ceccea1 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 18 Nov 2018 02:45:41 -0500 Subject: [PATCH 1/6] Adds Crowbars to Survival Boxes Fixes #4505 --- .../objects/items/weapons/storage/boxes.dm | 3 --- .../objects/items/weapons/storage/boxes_vr.dm | 24 +++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index b6dde04e70..2dd06bc0bc 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -56,7 +56,6 @@ name = "emergency supply box" 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/clothing/mask/breath ) @@ -64,7 +63,6 @@ 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/storage/box/survival/comp @@ -72,7 +70,6 @@ desc = "A comprehensive survival box issued to crew members for use in emergency situations. Contains additional supplies." icon_state = "survival" starts_with = list( - /obj/item/clothing/glasses/goggles, //VOREStation Add - Goggles for the phoron atmosphere, /obj/item/weapon/reagent_containers/hypospray/autoinjector, /obj/item/stack/medical/bruise_pack, /obj/item/device/flashlight/glowstick, diff --git a/code/game/objects/items/weapons/storage/boxes_vr.dm b/code/game/objects/items/weapons/storage/boxes_vr.dm index d3dcd936da..ea93d375c3 100644 --- a/code/game/objects/items/weapons/storage/boxes_vr.dm +++ b/code/game/objects/items/weapons/storage/boxes_vr.dm @@ -1,3 +1,27 @@ +/obj/item/weapon/storage/box/survival + starts_with = list( + /obj/item/weapon/tool/crowbar/red, + /obj/item/clothing/glasses/goggles, + /obj/item/clothing/mask/breath + ) + +/obj/item/weapon/storage/box/survival/synth + starts_with = list( + /obj/item/weapon/tool/crowbar/red, + /obj/item/clothing/glasses/goggles + ) + +/obj/item/weapon/storage/box/survival/comp + starts_with = list( + /obj/item/weapon/tool/crowbar/red, + /obj/item/clothing/glasses/goggles, + /obj/item/weapon/reagent_containers/hypospray/autoinjector, + /obj/item/stack/medical/bruise_pack, + /obj/item/device/flashlight/glowstick, + /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar, + /obj/item/clothing/mask/breath + ) + /obj/item/weapon/storage/box/explorerkeys name = "box of volunteer headsets" desc = "A box full of volunteer headsets, for issuing out to exploration volunteers." From 8fbd5a5d0a0d8144f81a91a76fab741af5313997 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 24 Nov 2018 16:23:17 -0500 Subject: [PATCH 2/6] Adds Door Pry, to Ace's specifications --- code/datums/autolathe/tools_vr.dm | 3 ++ .../objects/items/weapons/storage/boxes_vr.dm | 6 ++-- .../objects/items/weapons/tools/crowbar_vr.dm | 32 ++++++++++++++++++ icons/obj/tools_vr.dmi | Bin 0 -> 548 bytes vorestation.dme | 2 ++ 5 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 code/datums/autolathe/tools_vr.dm create mode 100644 code/game/objects/items/weapons/tools/crowbar_vr.dm create mode 100644 icons/obj/tools_vr.dmi diff --git a/code/datums/autolathe/tools_vr.dm b/code/datums/autolathe/tools_vr.dm new file mode 100644 index 0000000000..c89d768f0b --- /dev/null +++ b/code/datums/autolathe/tools_vr.dm @@ -0,0 +1,3 @@ +/datum/category_item/autolathe/tools/prybar + name = "prybar" + path =/obj/item/weapon/tool/prybar diff --git a/code/game/objects/items/weapons/storage/boxes_vr.dm b/code/game/objects/items/weapons/storage/boxes_vr.dm index ea93d375c3..81833a29a1 100644 --- a/code/game/objects/items/weapons/storage/boxes_vr.dm +++ b/code/game/objects/items/weapons/storage/boxes_vr.dm @@ -1,19 +1,19 @@ /obj/item/weapon/storage/box/survival starts_with = list( - /obj/item/weapon/tool/crowbar/red, + /obj/item/weapon/tool/prybar/red, /obj/item/clothing/glasses/goggles, /obj/item/clothing/mask/breath ) /obj/item/weapon/storage/box/survival/synth starts_with = list( - /obj/item/weapon/tool/crowbar/red, + /obj/item/weapon/tool/prybar/red, /obj/item/clothing/glasses/goggles ) /obj/item/weapon/storage/box/survival/comp starts_with = list( - /obj/item/weapon/tool/crowbar/red, + /obj/item/weapon/tool/prybar/red, /obj/item/clothing/glasses/goggles, /obj/item/weapon/reagent_containers/hypospray/autoinjector, /obj/item/stack/medical/bruise_pack, diff --git a/code/game/objects/items/weapons/tools/crowbar_vr.dm b/code/game/objects/items/weapons/tools/crowbar_vr.dm new file mode 100644 index 0000000000..bb62ea8a30 --- /dev/null +++ b/code/game/objects/items/weapons/tools/crowbar_vr.dm @@ -0,0 +1,32 @@ +/* + * Prybar + */ + +/obj/item/weapon/tool/prybar + name = "pry bar" + desc = "A steel bar with a wedge. It comes in a variety of configurations - collect them all." + icon = 'icons/obj/tools_vr.dmi' + icon_state = "prybar" + item_state = "crowbar" + flags = CONDUCT + slot_flags = SLOT_BELT + force = 4 + throwforce = 6 + pry = 1 + w_class = ITEMSIZE_SMALL + origin_tech = list(TECH_ENGINEERING = 1) + matter = list(DEFAULT_WALL_MATERIAL = 25) + attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") + usesound = 'sound/items/crowbar.ogg' + toolspeed = 1 + var/random_color = TRUE + +/obj/item/weapon/tool/prybar/red + icon_state = "prybar_red" + item_state = "crowbar_red" + random_color = FALSE + +/obj/item/weapon/tool/prybar/New() + if(random_color) + icon_state = "prybar[pick("","_green","_aubergine","_blue")]" + . = ..() 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: Sun, 25 Nov 2018 00:44:58 -0500 Subject: [PATCH 3/6] I like even numbers better --- code/game/objects/items/weapons/tools/crowbar_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/tools/crowbar_vr.dm b/code/game/objects/items/weapons/tools/crowbar_vr.dm index bb62ea8a30..98cef20829 100644 --- a/code/game/objects/items/weapons/tools/crowbar_vr.dm +++ b/code/game/objects/items/weapons/tools/crowbar_vr.dm @@ -15,7 +15,7 @@ pry = 1 w_class = ITEMSIZE_SMALL origin_tech = list(TECH_ENGINEERING = 1) - matter = list(DEFAULT_WALL_MATERIAL = 25) + matter = list(DEFAULT_WALL_MATERIAL = 30) attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") usesound = 'sound/items/crowbar.ogg' toolspeed = 1 From cdbaef570f325656a2e7255fe290240e4dbc8cd9 Mon Sep 17 00:00:00 2001 From: Spades Date: Sun, 25 Nov 2018 10:10:07 -0500 Subject: [PATCH 4/6] Deleted redundant code, added placeholder code --- .../objects/items/weapons/tools/crowbar_vr.dm | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/weapons/tools/crowbar_vr.dm b/code/game/objects/items/weapons/tools/crowbar_vr.dm index 98cef20829..91a47fb41f 100644 --- a/code/game/objects/items/weapons/tools/crowbar_vr.dm +++ b/code/game/objects/items/weapons/tools/crowbar_vr.dm @@ -4,23 +4,30 @@ /obj/item/weapon/tool/prybar name = "pry bar" - desc = "A steel bar with a wedge. It comes in a variety of configurations - collect them all." + 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" item_state = "crowbar" - flags = CONDUCT - slot_flags = SLOT_BELT force = 4 - throwforce = 6 - pry = 1 - w_class = ITEMSIZE_SMALL - origin_tech = list(TECH_ENGINEERING = 1) - matter = list(DEFAULT_WALL_MATERIAL = 30) - attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") + throwforce = 1 + matter = list(DEFAULT_WALL_MATERIAL = 25) + attack_verb = list("whapped", "smacked", "swatted", "thwacked", "hit") usesound = 'sound/items/crowbar.ogg' toolspeed = 1 var/random_color = TRUE +// Todo: Prevent it from prying up floor boards. Only affect doors. I couldn't remember how to do this. -Ace +/* +/obj/item/weapon/tool/prybar/on_hit() + if(istype(/obj/machinery/door/airlock)) + ..() + else if(istype(/mob) + ..() + else + // Tell the player that they can't use this on anything except airlocks. + return +*/ + /obj/item/weapon/tool/prybar/red icon_state = "prybar_red" item_state = "crowbar_red" From 3e741038dbbfb97be06c1cfbb8ef0a0e484bd772 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 25 Nov 2018 12:22:30 -0500 Subject: [PATCH 5/6] Not a child of crowbar, so code was not redundant --- .../objects/items/weapons/tools/crowbar_vr.dm | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/code/game/objects/items/weapons/tools/crowbar_vr.dm b/code/game/objects/items/weapons/tools/crowbar_vr.dm index 91a47fb41f..a3d3ed2a22 100644 --- a/code/game/objects/items/weapons/tools/crowbar_vr.dm +++ b/code/game/objects/items/weapons/tools/crowbar_vr.dm @@ -9,25 +9,16 @@ icon_state = "prybar" item_state = "crowbar" force = 4 - throwforce = 1 - matter = list(DEFAULT_WALL_MATERIAL = 25) + throwforce = 5 + pry = 1 + 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 -// Todo: Prevent it from prying up floor boards. Only affect doors. I couldn't remember how to do this. -Ace -/* -/obj/item/weapon/tool/prybar/on_hit() - if(istype(/obj/machinery/door/airlock)) - ..() - else if(istype(/mob) - ..() - else - // Tell the player that they can't use this on anything except airlocks. - return -*/ - /obj/item/weapon/tool/prybar/red icon_state = "prybar_red" item_state = "crowbar_red" From 66c81bd5215dd0f7777c1e234b67bee02c752277 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 25 Nov 2018 15:20:49 -0500 Subject: [PATCH 6/6] More fixes --- code/game/objects/items/weapons/tools/crowbar_vr.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/tools/crowbar_vr.dm b/code/game/objects/items/weapons/tools/crowbar_vr.dm index a3d3ed2a22..49cbfa63a9 100644 --- a/code/game/objects/items/weapons/tools/crowbar_vr.dm +++ b/code/game/objects/items/weapons/tools/crowbar_vr.dm @@ -7,10 +7,12 @@ 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" - item_state = "crowbar" + 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)