diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 5380a44ac3d..631a15b94a4 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -1168,7 +1168,7 @@ else usr << "\blue \The [src] was bitten multiple times!" -/obj/item/weapon/reagent_containers/food/snacks/sliceable +/obj/item/weapon/reagent_containers/food/snacks var/slice_path var/slices_num attackby(obj/item/weapon/W as obj, mob/user as mob) diff --git a/code/defines/obj/clothing/gloves.dm b/code/defines/obj/clothing/gloves.dm index 076f08e22ab..b4b05cd3bdf 100644 --- a/code/defines/obj/clothing/gloves.dm +++ b/code/defines/obj/clothing/gloves.dm @@ -91,6 +91,16 @@ heat_transfer_coefficient = 0.01 armor = list(melee = 0, bullet = 0, laser = 2, taser = 30, bomb = 0, bio = 0, rad = 0) +/obj/item/clothing/gloves/captain + desc = "Regal blue gloves, with a nice gold trim. Swanky." + name = "Captain Gloves" + icon_state = "captain" + item_state = "egloves" + siemens_coefficient = 0.30 + protective_temperature = 1100 + heat_transfer_coefficient = 0.05 + armor = list(melee = 80, bullet = 60, laser = 50, taser = 30, bomb = 50, bio = 15, rad = 5) + /obj/item/clothing/gloves/botanic_leather desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin." name = "botanic leather gloves" diff --git a/code/defines/obj/clothing/head.dm b/code/defines/obj/clothing/head.dm index 6538279104b..bd52ad9f215 100644 --- a/code/defines/obj/clothing/head.dm +++ b/code/defines/obj/clothing/head.dm @@ -149,10 +149,10 @@ protective_temperature = 500 heat_transfer_coefficient = 0.10 -/obj/item/clothing/head/seccoft +/obj/item/clothing/head/secsoft name = "Security Coft Hat" desc = "An armored baseball hat." - icon_state = "seccoft" + icon_state = "secsoft" flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES item_state = "helmet" armor = list(melee = 60, bullet = 40, laser = 40, taser = 10, bomb = 15, bio = 10, rad = 0) diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 97c44399748..1d2bfa2a79e 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -559,6 +559,22 @@ plant_type = 0 growthstages = 6 +/obj/item/seeds/watermelonseed + name = "Watermelon Seed" + desc = "Some promising seeds." + icon_state = "seed-watermelon" + mypath = "/obj/item/seeds/watermelonseed" + species = "watermelon" + plantname = "Watermelon" + productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon" + lifespan = 50 + endurance = 40 + maturation = 6 + production = 6 + yield = 3 + plant_type = 0 + growthstages = 6 + /* /obj/item/seeds/ name = "" @@ -726,6 +742,16 @@ ..() reagents.add_reagent("nutriment", 2) +/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon + seed = "/obj/item/seeds/watermelonseed" + name = "Watermelon" + desc = "A melon full of watery goodness" + icon_state = "watermelon" + potency = 10 + New() + ..() + reagents.add_reagent("nutriment", 10) + /obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet seed = "/obj/item/seeds/whitebeetseed" name = "White Beet" diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index c8a0fb74796..c7bbee93625 100644 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -128,8 +128,8 @@ name = "MegaSeed Servitor" desc = "When you need seeds fast!" icon_state = "seeds" - product_paths = "/obj/item/seeds/bananaseed;/obj/item/seeds/berryseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/chiliseed;/obj/item/seeds/cornseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/potatoseed;/obj/item/seeds/replicapod;/obj/item/seeds/soyaseed;/obj/item/seeds/sunflowerseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/towermycelium;/obj/item/seeds/wheatseed;/obj/item/seeds/appleseed;/obj/item/seeds/poppyseed;/obj/item/seeds/athelasmorganstearsseed;/obj/item/seeds/whitebeetseed" - product_amounts = "3;2;2;2;2;2;2;2;3;2;2;2;2;2;3;5;4;3" + product_paths = "/obj/item/seeds/bananaseed;/obj/item/seeds/berryseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/chiliseed;/obj/item/seeds/cornseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/potatoseed;/obj/item/seeds/replicapod;/obj/item/seeds/soyaseed;/obj/item/seeds/sunflowerseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/towermycelium;/obj/item/seeds/wheatseed;/obj/item/seeds/appleseed;/obj/item/seeds/poppyseed;/obj/item/seeds/athelasmorganstearsseed;/obj/item/seeds/whitebeetseed;/obj/item/seeds/watermelonseed" + product_amounts = "3;2;2;2;2;2;2;2;3;2;2;2;2;2;3;5;4;3;3" product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!" product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/glowshroom;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium" product_hideamt = "2;2;2;2;2" diff --git a/code/game/objects/closets/secure/captain.dm b/code/game/objects/closets/secure/captain.dm index bb705db7d7d..ed4b1043bd9 100644 --- a/code/game/objects/closets/secure/captain.dm +++ b/code/game/objects/closets/secure/captain.dm @@ -12,4 +12,5 @@ new /obj/item/clothing/head/helmet/swat( src ) new /obj/item/clothing/suit/captunic( src ) new /obj/item/clothing/head/helmet/cap( src ) + new /obj/item/clothing/gloves/captain( src ) return diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index d1de68d17f8..70f19a3fa7b 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -14,8 +14,8 @@ new /obj/item/clothing/head/helmet(src) new /obj/item/clothing/glasses/sunglasses(src) new /obj/item/weapon/melee/baton(src) - new /obj/item/clothing/head/seccoft(src) - new /obj/item/clothing/head/seccoft(src) + new /obj/item/clothing/head/secsoft(src) + new /obj/item/clothing/head/secsoft(src) return /obj/secure_closet/security1/proc/prison_break() @@ -43,7 +43,6 @@ new /obj/item/device/detective_scanner( src ) new /obj/item/device/detective_scanner( src ) new /obj/item/device/detective_scanner( src ) - new /obj/item/clothing/head/seccoft( src ) return /obj/secure_closet/highsec/New() @@ -58,7 +57,7 @@ new /obj/item/clothing/glasses/sunglasses( src ) new /obj/item/clothing/suit/armor/vest( src ) new /obj/item/clothing/head/helmet( src ) - new /obj/item/clothing/head/seccoft( src ) + new /obj/item/clothing/head/secsoft( src ) return /obj/secure_closet/hos/New() @@ -78,7 +77,6 @@ new /obj/item/weapon/storage/flashbang_kit(src) new /obj/item/weapon/handcuffs(src) new /obj/item/weapon/melee/baton(src) - new /obj/item/clothing/head/seccoft(src) return /obj/secure_closet/injection/New() diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index ad8a4c62e64..15f0b8449e3 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -1060,6 +1060,33 @@ reagents.add_reagent("imidazoline", 3) bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/superbiteburger + name = "Super Bite Burger" + desc = "This is a mountain of a burger. FOOD!" + icon_state = "superbiteburger" + New() + ..() + reagents.add_reagent("nutriment", 40) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/candiedapple + name = "Candied Apple" + desc = "An apple coated in sugary sweetness." + icon_state = "candiedapple" + New() + ..() + reagents.add_reagent("nutriment", 3) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/applepie + name = "Apple Pie" + desc = "A pie containing sweet sweet love...or apple." + icon_state = "applepie" + New() + ..() + reagents.add_reagent("nutriment", 4) + bitesize = 3 + /////////////////////////////////////////////////Sliceable//////////////////////////////////////// // All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels @@ -1238,6 +1265,41 @@ icon_state = "breadslice" bitesize = 2 +/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon + name = "Watermelon" + icon_state = "A juicy watermelon" + icon_state = "watermelon" + slice_path = /obj/item/weapon/reagent_containers/food/snacks/watermelonslice + slices_num = 5 + New() + ..() + reagents.add_reagent("nutriment", 10) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/watermelonslice + name = "Watermelon Slice" + desc = "A slice of watery goodness." + icon_state = "watermelonslice" + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake + name = "Apple Cake" + desc = "A cake centred with Apple" + icon_state = "applecake" + slice_path = /obj/item/weapon/reagent_containers/food/snacks/applecakeslice + slices_num = 5 + New() + ..() + reagents.add_reagent("nutriment", 29) + +/obj/item/weapon/reagent_containers/food/snacks/applecakeslice + name = "Apple Cake slice" + desc = "A slice of heavenly cake." + icon_state = "applecakeslice" + bitesize = 2 + + + /////////////////////////////////////////////////PIZZA//////////////////////////////////////// @@ -1249,6 +1311,7 @@ desc = "The most cheezy pizza in galaxy" icon_state = "pizzamargherita" slice_path = /obj/item/weapon/reagent_containers/food/snacks/margheritaslice + slices_num = 6 New() ..() reagents.add_reagent("nutriment", 40) @@ -1266,6 +1329,7 @@ desc = "" //TODO: icon_state = "meatpizza" slice_path = /obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice + slices_num = 6 New() ..() reagents.add_reagent("nutriment", 50) @@ -1283,6 +1347,7 @@ desc = "Very special pizza" icon_state = "mushroompizza" slice_path = /obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice + slices_num = 6 New() ..() reagents.add_reagent("nutriment", 35) @@ -1299,6 +1364,7 @@ desc = "No one of Tomatos Sapiens were harmed during making this pizza" icon_state = "vegetablepizza" slice_path = /obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice + slices_num = 6 New() ..() reagents.add_reagent("nutriment", 30) diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 02c99ea0ad9..ea091464a7f 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -851,3 +851,57 @@ /obj/item/weapon/reagent_containers/food/snacks/faggot, ) result = /obj/item/weapon/reagent_containers/food/snacks/meatballspagetti + +/datum/recipe/superbiteburger + reagents = list("sodiumchloride" = 5, "blackpepper" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/meat, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + /obj/item/weapon/reagent_containers/food/snacks/grown/tomato, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + + ) + result = /obj/item/weapon/reagent_containers/food/snacks/superbiteburger + +/datum/recipe/candiedapple + reagents = list("water" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/grown/apple, + /obj/item/weapon/reagent_containers/food/snacks/sugar, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple + +/datum/recipe/applepie + items = list( + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/grown/apple, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/applepie + +/datum/recipe/applecake + reagents = list("milk" = 5) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/flour, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/egg, + /obj/item/weapon/reagent_containers/food/snacks/grown/apple, + /obj/item/weapon/reagent_containers/food/snacks/grown/apple, + ) + result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 175e1978860..76472ed9950 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 5586c66520f..a0ebbea8712 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index d2adc90dea2..36afb2569b0 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index cee716642dd..b24c4563deb 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index fbd2d908831..d6500b809a1 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 86e9c7309f9..bfe8f45b569 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 2ad4caff4e1..4d089848a81 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/harvest.dmi b/icons/obj/harvest.dmi index 36f8dbc76ce..87112fd287d 100644 Binary files a/icons/obj/harvest.dmi and b/icons/obj/harvest.dmi differ diff --git a/icons/obj/hydroponics.dmi b/icons/obj/hydroponics.dmi index d0299d8382b..60bcbcce9ae 100644 Binary files a/icons/obj/hydroponics.dmi and b/icons/obj/hydroponics.dmi differ diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi index ab1bcefb64b..e50f8caf2b2 100644 Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ diff --git a/maps/tgstation.2.0.7.dmm b/maps/tgstation.2.0.7.dmm index 0f8b4562bfd..5ae604d7b10 100644 --- a/maps/tgstation.2.0.7.dmm +++ b/maps/tgstation.2.0.7.dmm @@ -548,7 +548,7 @@ "akB" = (/obj/machinery/atmospherics/pipe/simple,/obj/grille,/obj/window/reinforced,/obj/window/reinforced{dir = 1},/obj/window/reinforced{dir = 4},/obj/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/security/hos) "akC" = (/obj/disposalpipe/segment,/turf/simulated/wall/r_wall,/area/security/hos) "akD" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/security/main) -"akE" = (/obj/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/clothing/head/seccoft,/turf/simulated/floor,/area/security/main) +"akE" = (/obj/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/clothing/head/secsoft,/turf/simulated/floor,/area/security/main) "akF" = (/obj/table,/obj/item/clothing/glasses/sunglasses,/obj/item/weapon/crowbar,/turf/simulated/floor,/area/security/main) "akG" = (/obj/machinery/vending/security,/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/security/main) "akH" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/fsmaint)