From 2e20b8ea91314766408815d0804e321a10b08c3c Mon Sep 17 00:00:00 2001 From: Firecage Date: Sun, 11 Jan 2015 16:53:41 +0200 Subject: [PATCH 1/4] Biogenerator stuff. --- .../objects/items/weapons/storage/belt.dm | 3 ++ code/modules/hydroponics/biogenerator.dm | 40 +++++++++++++++++-- code/modules/hydroponics/hydroitemdefines.dm | 22 +++++++++- 3 files changed, 59 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 0f13d3db284..3fb54f76571 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -100,6 +100,9 @@ ..() new /obj/item/device/flashlight/seclite(src) +/obj/item/weapon/storage/belt/security/empty/New() + ..() + /obj/item/weapon/storage/belt/soulstone name = "soul stone belt" desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away" diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 511c5807572..721d2fb9929 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -135,15 +135,19 @@ dat += "ActivateDetach Container" dat += "

Food:

" dat += "
" - dat += "10 milk: Make ([20/efficiency])
" - dat += "10 cream: Make ([30/efficiency])
" - dat += "Monkey cube: Make ([250/efficiency])" + dat += "10 milk: Makex5 ([20/efficiency])
" + dat += "10 cream: Makex5 ([30/efficiency])
" + dat += "Milk Carton: Makex5 ([100/efficiency])
" + dat += "Cream Carton: Makex5 ([150/efficiency])
" + dat += "Monkey cube: Makex5 ([250/efficiency])" dat += "
" - dat += "

Nutrients:

" + dat += "

Botany Chemicles:

" dat += "
" dat += "E-Z-Nutrient: Makex5 ([10/efficiency])
" dat += "Left 4 Zed: Makex5 ([20/efficiency])
" dat += "Robust Harvest: Makex5 ([25/efficiency])
" + dat += "Weed Killer: Makex5 ([25/efficiency])
" + dat += "Pest Killer: Makex5 ([25/efficiency])
" dat += "
" dat += "

Leather:

" dat += "
" @@ -153,6 +157,10 @@ dat += "Mining satchel: Make ([200/efficiency])
" dat += "Botanical gloves: Make ([250/efficiency])
" dat += "Utility belt: Make ([300/efficiency])
" + dat += "Security belt: Make ([300/efficiency])
" + dat += "Medical belt: Make ([300/efficiency])
" + dat += "Janitorial belt: Make ([300/efficiency])
" + dat += "Bandolier belt: Make ([300/efficiency])
" dat += "Leather Satchel: Make ([400/efficiency])
" dat += "Leather Jacket: Make ([500/efficiency])
" dat += "
" @@ -221,6 +229,12 @@ if(check_container_volume(10)) return 0 else if (check_cost(30/efficiency)) return 0 else beaker.reagents.add_reagent("cream",10) + if("cmilk") + if (check_cost(100/efficiency)) return 0 + else new/obj/item/weapon/reagent_containers/food/drinks/milk(src.loc) + if("ccream") + if (check_cost(150/efficiency)) return 0 + else new/obj/item/weapon/reagent_containers/food/drinks/bottle/cream(src.loc) if("meat") if (check_cost(250/efficiency)) return 0 else new/obj/item/weapon/reagent_containers/food/snacks/monkeycube(src.loc) @@ -233,6 +247,12 @@ if("rh") if (check_cost(25/efficiency)) return 0 else new/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh(src.loc) + if("wk") + if (check_cost(50/efficiency)) return 0 + else new/obj/item/weapon/reagent_containers/glass/bottle/weedkiller(src.loc) + if("pk") + if (check_cost(50/efficiency)) return 0 + else new/obj/item/weapon/reagent_containers/glass/bottle/pestkiller(src.loc) if("wallet") if (check_cost(100/efficiency)) return 0 else new/obj/item/weapon/storage/wallet(src.loc) @@ -251,6 +271,18 @@ if("tbelt") if (check_cost(300/efficiency)) return 0 else new/obj/item/weapon/storage/belt/utility(src.loc) + if("sbelt") + if (check_cost(300/efficiency)) return 0 + else new/obj/item/weapon/storage/belt/security/empty(src.loc) + if("mbelt") + if (check_cost(300/efficiency)) return 0 + else new/obj/item/weapon/storage/belt/medical(src.loc) + if("jbelt") + if (check_cost(300/efficiency)) return 0 + else new/obj/item/weapon/storage/belt/janitor(src.loc) + if("bbelt") + if (check_cost(300/efficiency)) return 0 + else new/obj/item/weapon/storage/belt/bandolier(src.loc) if("satchel") if (check_cost(400/efficiency)) return 0 else new/obj/item/weapon/storage/backpack/satchel(src.loc) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index ad113e110ba..98e669c7399 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -17,7 +17,7 @@ /obj/item/weapon/reagent_containers/spray/weedspray // -- Skie desc = "It's a toxic mixture, in spray form, to kill small weeds." icon = 'icons/obj/hydroponics.dmi' - name = "weed-spray" + name = "weed spray" icon_state = "weedspray" item_state = "spray" volume = 100 @@ -39,7 +39,7 @@ /obj/item/weapon/reagent_containers/spray/pestspray // -- Skie desc = "It's some pest eliminator spray! Do not inhale!" icon = 'icons/obj/hydroponics.dmi' - name = "pest-spray" + name = "pest spray" icon_state = "pestspray" item_state = "spray" volume = 100 @@ -118,3 +118,21 @@ /obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh/New() ..() reagents.add_reagent("robustharvestnutriment", 50) + +/obj/item/weapon/reagent_containers/glass/bottle/weedkiller + name = "bottle of weed killer" + icon = 'icons/obj/chemical.dmi' + icon_state = "bottle19" + +/obj/item/weapon/reagent_containers/glass/bottle/weedkiller/New() + ..() + reagents.add_reagent("weedkiller", 50) + +/obj/item/weapon/reagent_containers/glass/bottle/pestkiller + name = "bottle of pest spray" + icon = 'icons/obj/chemical.dmi' + icon_state = "bottle20" + +/obj/item/weapon/reagent_containers/glass/bottle/pestkiller/New() + ..() + reagents.add_reagent("pestkiller", 50) From c1368f6816dc8fadd0ca11cd3ad59457dc8dc7a9 Mon Sep 17 00:00:00 2001 From: Firecage Date: Sun, 11 Jan 2015 21:31:21 +0200 Subject: [PATCH 2/4] Fixes what Miauw said with the secbelt thing. --- code/game/objects/items/weapons/storage/belt.dm | 5 +---- .../structures/crates_lockers/closets/secure/security.dm | 6 +++--- code/modules/hydroponics/biogenerator.dm | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 3fb54f76571..ca983cbc845 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -96,13 +96,10 @@ /obj/item/weapon/melee/classic_baton/telescopic ) -/obj/item/weapon/storage/belt/security/New() +/obj/item/weapon/storage/belt/security/full/New() ..() new /obj/item/device/flashlight/seclite(src) -/obj/item/weapon/storage/belt/security/empty/New() - ..() - /obj/item/weapon/storage/belt/soulstone name = "soul stone belt" desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 3c347b9dae7..00472ab6dda 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -83,7 +83,7 @@ new /obj/item/weapon/shield/riot/tele(src) new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/weapon/gun/energy/gun/advtaser(src) - new /obj/item/weapon/storage/belt/security(src) + new /obj/item/weapon/storage/belt/security/full(src) new /obj/item/clothing/suit/toggle/wintercoat/security(src) return @@ -113,7 +113,7 @@ new /obj/item/weapon/reagent_containers/spray/pepper(src) new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/weapon/gun/energy/gun/advtaser(src) - new /obj/item/weapon/storage/belt/security(src) + new /obj/item/weapon/storage/belt/security/full(src) new /obj/item/clothing/suit/toggle/wintercoat/security(src) return @@ -137,7 +137,7 @@ new /obj/item/weapon/reagent_containers/spray/pepper(src) new /obj/item/device/flash/handheld(src) new /obj/item/weapon/grenade/flashbang(src) - new /obj/item/weapon/storage/belt/security(src) + new /obj/item/weapon/storage/belt/security/full(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/clothing/suit/toggle/wintercoat/security(src) return diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 721d2fb9929..c011eb2cb37 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -273,7 +273,7 @@ else new/obj/item/weapon/storage/belt/utility(src.loc) if("sbelt") if (check_cost(300/efficiency)) return 0 - else new/obj/item/weapon/storage/belt/security/empty(src.loc) + else new/obj/item/weapon/storage/belt/security(src.loc) if("mbelt") if (check_cost(300/efficiency)) return 0 else new/obj/item/weapon/storage/belt/medical(src.loc) From 20880453111357744a7159e139320281ddeed5f6 Mon Sep 17 00:00:00 2001 From: Firecage Date: Mon, 12 Jan 2015 16:24:57 +0200 Subject: [PATCH 3/4] Adds changelog for this PR --- html/changelogs/FIRECAGE-PR-6969.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/FIRECAGE-PR-6969.yml diff --git a/html/changelogs/FIRECAGE-PR-6969.yml b/html/changelogs/FIRECAGE-PR-6969.yml new file mode 100644 index 00000000000..f91da05e8c9 --- /dev/null +++ b/html/changelogs/FIRECAGE-PR-6969.yml @@ -0,0 +1,6 @@ +author: Firecage + +delete-after: True + +changes: + - rscadd: "NanoTrasen would like to report that our Mechanical Engineers at NTEngiCore has recently upgraded the capacity of the machines known as Biogenerators. They are now have the added ability to create various belts, and also weed/plantkillers and cartons of milk and cream!" From 204fdb8b2fcd3872d1fd2e2002105caa12f8dcda Mon Sep 17 00:00:00 2001 From: Firecage Date: Fri, 16 Jan 2015 09:24:39 +0200 Subject: [PATCH 4/4] Update to biogenerator stuff PR --- code/modules/hydroponics/biogenerator.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index c011eb2cb37..3849d5aa4d8 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -138,16 +138,16 @@ dat += "10 milk: Makex5 ([20/efficiency])
" dat += "10 cream: Makex5 ([30/efficiency])
" dat += "Milk Carton: Makex5 ([100/efficiency])
" - dat += "Cream Carton: Makex5 ([150/efficiency])
" + dat += "Cream Carton: Makex5 ([300/efficiency])
" dat += "Monkey cube: Makex5 ([250/efficiency])" dat += "" - dat += "

Botany Chemicles:

" + dat += "

Botany Chemicals:

" dat += "
" dat += "E-Z-Nutrient: Makex5 ([10/efficiency])
" dat += "Left 4 Zed: Makex5 ([20/efficiency])
" dat += "Robust Harvest: Makex5 ([25/efficiency])
" - dat += "Weed Killer: Makex5 ([25/efficiency])
" - dat += "Pest Killer: Makex5 ([25/efficiency])
" + dat += "Weed Killer: Makex5 ([50/efficiency])
" + dat += "Pest Killer: Makex5 ([50/efficiency])
" dat += "
" dat += "

Leather:

" dat += "
" @@ -233,7 +233,7 @@ if (check_cost(100/efficiency)) return 0 else new/obj/item/weapon/reagent_containers/food/drinks/milk(src.loc) if("ccream") - if (check_cost(150/efficiency)) return 0 + if (check_cost(300/efficiency)) return 0 else new/obj/item/weapon/reagent_containers/food/drinks/bottle/cream(src.loc) if("meat") if (check_cost(250/efficiency)) return 0