cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4506 from Novacat/nova-survival

Browse Source 
Adds Prybars to Survival Boxes
This commit is contained in:
Spades
2018-12-04 20:21:05 -05:00
committed by GitHub
parent c42b44e0fd 66c81bd521
commit e9b0432420
6 changed files with 61 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/datums/autolathe/tools_vr.dm Normal file
View File

@@ -0,0 +1,3 @@
/datum/category_item/autolathe/tools/prybar
name = "prybar"
path =/obj/item/weapon/tool/prybar

3
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -56,7 +56,6 @@
name = "emergency supply box" name = "emergency supply box"
desc = "A survival box issued to crew members for use in emergency situations." desc = "A survival box issued to crew members for use in emergency situations."
starts_with = list( starts_with = list(
/obj/item/clothing/glasses/goggles, //VOREStation Add - Goggles for the phoron atmosphere,
/obj/item/clothing/mask/breath /obj/item/clothing/mask/breath
) )
@@ -64,7 +63,6 @@
name = "synthetic supply box" name = "synthetic supply box"
desc = "A survival box issued to synthetic crew members for use in emergency situations." desc = "A survival box issued to synthetic crew members for use in emergency situations."
starts_with = list( starts_with = list(
/obj/item/clothing/glasses/goggles //VOREStation Add - Goggles for the phoron atmosphere,
) )
/obj/item/weapon/storage/box/survival/comp /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." desc = "A comprehensive survival box issued to crew members for use in emergency situations. Contains additional supplies."
icon_state = "survival" icon_state = "survival"
starts_with = list( starts_with = list(
/obj/item/clothing/glasses/goggles, //VOREStation Add - Goggles for the phoron atmosphere,
/obj/item/weapon/reagent_containers/hypospray/autoinjector, /obj/item/weapon/reagent_containers/hypospray/autoinjector,
/obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack,
/obj/item/device/flashlight/glowstick, /obj/item/device/flashlight/glowstick,

24
code/game/objects/items/weapons/storage/boxes_vr.dm
View File

@@ -1,3 +1,27 @@
/obj/item/weapon/storage/box/survival
starts_with = list(
/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/prybar/red,
/obj/item/clothing/glasses/goggles
)
/obj/item/weapon/storage/box/survival/comp
starts_with = list(
/obj/item/weapon/tool/prybar/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 /obj/item/weapon/storage/box/explorerkeys
name = "box of volunteer headsets" name = "box of volunteer headsets"
desc = "A box full of volunteer headsets, for issuing out to exploration volunteers." desc = "A box full of volunteer headsets, for issuing out to exploration volunteers."

32
code/game/objects/items/weapons/tools/crowbar_vr.dm Normal file
View File

@@ -0,0 +1,32 @@
/*
* Prybar
*/
/obj/item/weapon/tool/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/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")]"
. = ..()

BIN
icons/obj/tools_vr.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 548 B

2
vorestation.dme
View File

@@ -267,6 +267,7 @@
#include "code\datums\autolathe\medical.dm" #include "code\datums\autolathe\medical.dm"
#include "code\datums\autolathe\medical_vr.dm" #include "code\datums\autolathe\medical_vr.dm"
#include "code\datums\autolathe\tools.dm" #include "code\datums\autolathe\tools.dm"
#include "code\datums\autolathe\tools_vr.dm"
#include "code\datums\helper_datums\construction_datum.dm" #include "code\datums\helper_datums\construction_datum.dm"
#include "code\datums\helper_datums\events.dm" #include "code\datums\helper_datums\events.dm"
#include "code\datums\helper_datums\getrev.dm" #include "code\datums\helper_datums\getrev.dm"
@@ -1154,6 +1155,7 @@
#include "code\game\objects\items\weapons\tanks\tank_types_vr.dm" #include "code\game\objects\items\weapons\tanks\tank_types_vr.dm"
#include "code\game\objects\items\weapons\tanks\tanks.dm" #include "code\game\objects\items\weapons\tanks\tanks.dm"
#include "code\game\objects\items\weapons\tools\crowbar.dm" #include "code\game\objects\items\weapons\tools\crowbar.dm"
#include "code\game\objects\items\weapons\tools\crowbar_vr.dm"
#include "code\game\objects\items\weapons\tools\screwdriver.dm" #include "code\game\objects\items\weapons\tools\screwdriver.dm"
#include "code\game\objects\items\weapons\tools\weldingtool.dm" #include "code\game\objects\items\weapons\tools\weldingtool.dm"
#include "code\game\objects\items\weapons\tools\wirecutters.dm" #include "code\game\objects\items\weapons\tools\wirecutters.dm"