cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 23:49:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4868 from Novacat/nova-weapons

Browse Source 
Adds liquidprotein rations
This commit is contained in:
Novacat
2019-04-05 17:17:53 -04:00
committed by GitHub
parent 688e5184cb 71ac951395
commit d7c7c073a5
11 changed files with 70 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks/misc_vr.dm
+18
View File
@@ -13,6 +13,24 @@
containername = "Belt-miner gear crate"
access = access_mining
/datum/supply_pack/misc/rations
name = "Emergency rations"
contains = list(
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 4,
)
cost = 20
containertype = /obj/structure/closet/crate/freezer
containername = "emergency rations"
/datum/supply_pack/misc/proteinrations
name = "Emergency meat rations"
contains = list(
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 4,
)
cost = 30
containertype = /obj/structure/closet/crate/freezer
containername = "emergency meat rations"
/datum/supply_pack/misc/eva_rig
name = "eva hardsuit (empty)"
contains = list(
code/game/machinery/vending.dm
+1 -1
View File
@@ -802,7 +802,7 @@
prices = list(/obj/item/weapon/reagent_containers/food/drinks/smallmilk = 3,
/obj/item/weapon/reagent_containers/food/drinks/smallchocmilk = 3,
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 20,
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteinshake = 40, //VOREStation Edit,
/obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask = 5,
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar = 5,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 5,
code/game/machinery/vending_vr.dm
+5
View File
@@ -127,3 +127,8 @@
contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6)
prices = list(/obj/item/device/flash = 600,/obj/item/weapon/reagent_containers/spray/pepper = 800, /obj/item/weapon/gun/projectile/olivaw = 1600, /obj/item/weapon/gun/projectile/giskard = 1200, /obj/item/ammo_magazine/mg/cl32/rubber = 200)
*/
/obj/machinery/vending/fitness/New()
products += list(/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 8)
prices += list(/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 10)
..()
code/game/objects/items/trash_vr.dm
+6 -1
View File
@@ -24,4 +24,9 @@
forceMove(R.vore_selected)
R.visible_message("<span class='warning'>[user] feeds [R] with [src]!</span>")
return
..()
..()
/obj/item/trash/liquidprotein
name = "\improper \"LiquidProtein\" ration"
icon = 'icons/obj/trash_vr.dmi'
icon_state = "liquidprotein"
code/modules/food/food/snacks_vr.dm
+15
View File
@@ -500,3 +500,18 @@
/obj/item/pizzabox/meat/Initialize()
pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/meatfrozen(src)
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein
name = "\improper LiquidProtein Ration"
desc = "A variant of the liquidfood ration, designed for obligate carnivore species. Only barely more appealing than regular liquidfood. Should this be crunchy?"
icon = 'icons/obj/food_vr.dmi'
icon_state = "liquidprotein"
trash = /obj/item/trash/liquidprotein
filling_color = "#A8A8A8"
center_of_mass = list("x"=16, "y"=15)
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein/Initialize()
..()
reagents.add_reagent("protein", 20)
reagents.add_reagent("iron", 3)
bitesize = 4
icons/obj/food_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 19 KiB

icons/obj/trash_vr.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 428 B

maps/southern_cross/structures/closets/misc_vr.dm
+10 -8
View File
@@ -24,9 +24,9 @@
/obj/item/weapon/material/knife/tacknife/survival,
/obj/item/weapon/material/knife/machete,
/obj/item/clothing/accessory/holster/machete,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2,
/obj/item/device/cataloguer
)
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/device/cataloguer)
/obj/structure/closet/secure_closet/sar
name = "field medic locker"
@@ -52,7 +52,8 @@
/obj/item/device/healthanalyzer,
/obj/item/device/radio/off,
/obj/random/medical,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 3,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 2,
/obj/item/weapon/tool/crowbar,
/obj/item/weapon/extinguisher/mini,
/obj/item/weapon/storage/box/freezer,
@@ -76,7 +77,8 @@
/obj/item/clothing/gloves/fingerless,
/obj/item/device/radio/headset/pilot/alt,
/obj/item/device/flashlight,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/storage/box/flare,
/obj/item/weapon/cell/device,
@@ -113,9 +115,9 @@
/obj/item/weapon/material/knife/machete/deluxe,
/obj/item/weapon/gun/energy/frontier/locked/carbine,
/obj/item/clothing/accessory/holster/machete,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2,
/obj/item/device/cataloguer
)
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/device/cataloguer)
/obj/structure/closet/secure_closet/pathfinder/Initialize()
if(prob(50))
maps/submaps/shelters/shelter_1.dmm
+3 -2
View File
@@ -17,8 +17,9 @@
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
maps/submaps/shelters/shelter_2.dmm
+6 -4
View File
@@ -38,10 +38,12 @@
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
maps/submaps/shelters/shelter_3.dmm
+6 -4
View File
@@ -37,10 +37,12 @@
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,
/obj/item/device/fbp_backup_cell,