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

[SEMIMODULAR] Medical Bandolier (& One Fix) (#7696)

Browse Source 
* pistolero

* the ammo too

* whoops

* Apply suggestions from code review

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>

* yeah

* wew

* there

Co-authored-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
This commit is contained in:
Snakebittenn
2021-08-22 19:25:23 -04:00
committed by GitHub
co-authored by FlamingLily Tom
parent 110cdb9fde
commit bd76a8a358
8 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/biogenerator_designs.dm
-10
View File
@@ -66,16 +66,6 @@
build_path = /obj/item/food/monkeycube
category = list("initial","Food")
//SKYRAT EDIT ADDITION BEGIN
/datum/design/biomeat
name = "Meat Product"
id = "meatp"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass= 125) //Monkey Cube is more efficient, but this is easier on the chef.
build_path = /obj/item/food/meat/slab/meatproduct
category = list("initial","Food")
//SKYRAT EDIT ADDITION END
/datum/design/ez_nut //easy nut :)
name = "25u E-Z Nutrient"
id = "ez_nut"
code/modules/vending/wardrobes.dm
+2 -1
View File
@@ -80,7 +80,8 @@
/obj/item/clothing/suit/apron/surgical = 4,
/obj/item/clothing/mask/surgical = 4,
/obj/item/clothing/gloves/color/latex/nitrile = 2, //SKYRAT EDIT ADDITION
/obj/item/clothing/suit/toggle/labcoat/hospitalgown = 4) //SKYRAT EDIT ADDITION
/obj/item/clothing/suit/toggle/labcoat/hospitalgown = 4, //SKYRAT EDIT ADDITION
/obj/item/storage/belt/medbandolier = 2) // SKYRAT EDIT ADDITION
refill_canister = /obj/item/vending_refill/wardrobe/medi_wardrobe
payment_department = ACCOUNT_MED
modular_skyrat/master_files/code/modules/research/designs/biogenerator_designs.dm
+15
View File
@@ -0,0 +1,15 @@
/datum/design/medbandolier
name = "Medical Bandolier"
id = "medban"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass = 600)
build_path = /obj/item/storage/belt/medbandolier
category = list("initial","Organic Materials")
/datum/design/biomeat
name = "Meat Product"
id = "meatp"
build_type = BIOGENERATOR
materials = list(/datum/material/biomass= 125) //Monkey Cube is more efficient, but this is easier on the chef.
build_path = /obj/item/food/meat/slab/meatproduct
category = list("initial","Food")
modular_skyrat/master_files/icons/mob/clothing/back.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

modular_skyrat/master_files/icons/mob/clothing/belt.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

modular_skyrat/master_files/icons/obj/clothing/belts.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

modular_skyrat/modules/customization/modules/clothing/storage/belts.dm
+35
View File
@@ -135,3 +135,38 @@
icon_state = "cowboy_belt"
worn_icon_state = "cowboy_belt"
inhand_icon_state = "utility"
/obj/item/storage/belt/medbandolier
icon = 'modular_skyrat/master_files/icons/obj/clothing/belts.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/belt.dmi'
name = "medical bandolier"
desc = "A pocketed, pine green belt slung like a sash over the shoulder. Features numerous pockets for medicines, poisons, and your smoke break. Now is coward healing time."
icon_state = "med_bandolier"
worn_icon_state = "med_bandolier"
/obj/item/storage/belt/medbandolier/ComponentInitialize()
. = ..()
var/datum/component/storage/bandolier_storage = GetComponent(/datum/component/storage)
bandolier_storage.max_w_class = WEIGHT_CLASS_NORMAL
bandolier_storage.max_combined_w_class = 21
bandolier_storage.set_holdable(list(
/obj/item/dnainjector,
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/glass/beaker,
/obj/item/reagent_containers/glass/bottle,
/obj/item/reagent_containers/pill,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/medigel,
/obj/item/reagent_containers/glass/bottle/vial,
/obj/item/lighter, // This was too funny to pass up.
/obj/item/storage/fancy/cigarettes, // Same here.
/obj/item/storage/pill_bottle,
/obj/item/reagent_containers/hypospray,
/obj/item/hypospray/mkii,
/obj/item/gun/syringe/syndicate,
/obj/item/implantcase,
/obj/item/implant,
/obj/item/implanter,
/obj/item/reagent_containers/spray,
/obj/item/medicell
))
tgstation.dme
+1
View File
@@ -3891,6 +3891,7 @@
#include "modular_skyrat\master_files\code\modules\projectiles\guns\ballistic\revolver.dm"
#include "modular_skyrat\master_files\code\modules\reagents\chemistry\colors.dm"
#include "modular_skyrat\master_files\code\modules\reagents\withdrawal\generic_addictions.dm"
#include "modular_skyrat\master_files\code\modules\research\designs\biogenerator_designs.dm"
#include "modular_skyrat\master_files\code\modules\research\designs\misc_designs.dm"
#include "modular_skyrat\master_files\code\modules\shuttle\shuttle.dm"
#include "modular_skyrat\master_files\code\modules\shuttle\supply.dm"