diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index b467a3a375..4a8b4f2d3c 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -1,5 +1,5 @@ /obj/machinery/biogenerator - name = "Biogenerator" + name = "biogenerator" desc = "" icon = 'icons/obj/biogenerator.dmi' icon_state = "biogen-stand" @@ -115,6 +115,7 @@ dat += "Utility belt ([round(300/build_eff)])
" dat += "Leather Satchel ([round(400/build_eff)])
" dat += "Cash Bag ([round(400/build_eff)])
" + dat += "Chemistry Bag ([round(400/build_eff)])
" dat += "Workboots ([round(400/build_eff)])
" dat += "Leather Shoes ([round(400/build_eff)])
" @@ -219,6 +220,8 @@ new/obj/item/weapon/storage/backpack/satchel(loc) if("cashbag") new/obj/item/weapon/storage/bag/cash(loc) + if("chembag") + new/obj/item/weapon/storage/bag/chemistry(loc) if("monkey") new/mob/living/carbon/human/monkey(loc) if("workboots") @@ -271,4 +274,4 @@ man_rating += P.rating build_eff = man_rating - eat_eff = bin_rating \ No newline at end of file + eat_eff = bin_rating diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 519fff3d50..3d8a9f0b5c 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -248,3 +248,16 @@ max_w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_SMALL can_hold = list(/obj/item/weapon/coin,/obj/item/weapon/spacecash) + + // ----------------------------- + // Chemistry Bag + // ----------------------------- +/obj/item/weapon/storage/bag/chemistry + name = "chemistry bag" + icon = 'icons/obj/storage.dmi' + icon_state = "chembag" + desc = "A bag for storing pills, patches, and bottles." + max_storage_space = 200 + w_class = ITEMSIZE_LARGE + slowdown = 1 + can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/glass/bottle) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index c21b5d5fbb..87afb34fa4 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -425,6 +425,8 @@ new /obj/item/weapon/storage/backpack/chemistry(src) new /obj/item/weapon/storage/backpack/satchel/chem(src) new /obj/item/weapon/storage/backpack/satchel/chem(src) + new /obj/item/weapon/storage/bag/chemistry(src) + new /obj/item/weapon/storage/bag/chemistry(src) return @@ -682,4 +684,4 @@ new /obj/item/clothing/under/gimmick/rank/captain/suit(src) new /obj/item/clothing/under/gimmick/rank/captain/suit/skirt(src) new /obj/item/clothing/glasses/sunglasses(src) - return \ No newline at end of file + return diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm index 9ee2e9e738..d18ecc9d04 100644 --- a/code/modules/busy_space/organizations.dm +++ b/code/modules/busy_space/organizations.dm @@ -81,7 +81,17 @@ "Sagan", "Tyson", "Galilei", + "Jans", + "Fhriede", + "Franklin", "Tesla", + "Curie", + "Darwin", + "Newton", + "Pasteur", + "Bell", + "Mendel", + "Kepler", "Edision", "Cavendish", "Nye", diff --git a/code/modules/mob/living/simple_animal/constructs/soulstone.dm b/code/modules/mob/living/simple_animal/constructs/soulstone.dm index 7b5e77f5c3..fdd1615259 100644 --- a/code/modules/mob/living/simple_animal/constructs/soulstone.dm +++ b/code/modules/mob/living/simple_animal/constructs/soulstone.dm @@ -212,7 +212,7 @@ Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." Z.cancel_camera() qdel(src) -/obj/item/device/soulstone/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob). +/obj/item/device/soulstone/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob) switch(choice) if("VICTIM") transfer_human(target,U) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 7835b56d7d..44dce0a7ad 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -112,6 +112,8 @@ user << "You set the label to \"[tmp_label]\"." label_text = tmp_label update_name_label() + if(istype(W,/obj/item/weapon/storage/bag)) + ..() /obj/item/weapon/reagent_containers/glass/proc/update_name_label() if(label_text == "") diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 68a12155d7..21ffdc5f00 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/obj/abductor.dmi b/icons/obj/abductor.dmi index 0643d9105e..2d0695ec2f 100644 Binary files a/icons/obj/abductor.dmi and b/icons/obj/abductor.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 30d846ddaf..6af3f71071 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ