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

Merge branch 'master' of https://github.com/VOREStation/VOREStation into secbalance

Browse Source
This commit is contained in:
Yoshax
2017-02-14 21:53:36 +00:00
parent 3162c723d9 ce1aa19864
commit cad3a04113
6 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/machinery/vending_vr.dm
View File

@@ -13,6 +13,14 @@
/obj/item/weapon/gun/energy/taser = 8,/obj/item/weapon/gun/energy/stunrevolver = 4,
/obj/item/weapon/reagent_containers/spray/pepper = 6,/obj/item/taperoll/police = 6,
/obj/item/weapon/gun/projectile/sec/flash = 4)
/obj/machinery/vending/tool
products = list(/obj/item/stack/cable_coil/random = 10,/obj/item/weapon/crowbar = 5,/obj/item/weapon/weldingtool = 3,/obj/item/weapon/wirecutters = 5,
/obj/item/weapon/wrench = 5,/obj/item/device/analyzer = 5,/obj/item/device/t_scanner = 5,/obj/item/weapon/screwdriver = 5,
/obj/item/device/flashlight/glowstick = 3, /obj/item/device/flashlight/glowstick/red = 3, /obj/item/device/flashlight/glowstick/blue = 3,
/obj/item/device/flashlight/glowstick/orange =3, /obj/item/device/flashlight/glowstick/yellow = 3, /obj/item/weapon/reagent_containers/spray/windowsealant = 5)
/*
var/list/log = list()
var/req_log_access = access_armory

2
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
View File

@@ -37,6 +37,7 @@
new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/weapon/tank/emergency/oxygen/engi(src)
new /obj/item/weapon/reagent_containers/spray/windowsealant(src) //vorestation addition
return
@@ -128,6 +129,7 @@
new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/engineering(src)
new /obj/item/weapon/tank/emergency/oxygen/engi(src)
new /obj/item/weapon/reagent_containers/spray/windowsealant(src) //vorestation addition
return

3
code/game/objects/structures/crates_lockers/closets/utility_closets.dm
View File

@@ -137,7 +137,8 @@
new /obj/item/clothing/gloves/yellow(src)
if(prob(40))
new /obj/item/clothing/head/hardhat(src)
if(prob(30))
new /obj/item/weapon/reagent_containers/spray/windowsealant(src) //vorestation addition
/*
* Radiation Closet

12
code/modules/reagents/reagent_containers/spray_vr.dm Normal file
View File

@@ -0,0 +1,12 @@
/obj/item/weapon/reagent_containers/spray/windowsealant
name = "Krak-b-gone"
desc = "A spray bottle of silicate sealant for rapid window repair."
icon = 'icons/obj/items_vr.dmi'
icon_state = "windowsealant"
item_state = "spraycan"
possible_transfer_amounts = null
volume = 80
/obj/item/weapon/reagent_containers/spray/windowsealant/New()
..()
reagents.add_reagent("silicate", 80)