From 62a8277ad9381511c1723f6465a746cfba7d2e37 Mon Sep 17 00:00:00 2001 From: evilew Date: Tue, 30 Jul 2024 14:58:51 +0200 Subject: [PATCH] more small tweaks - added butt enlargement pill bottles preset + maintloot - added some more maintloot - nerfed ointment / bandages a bit more - nerfed lavaland syndie turrets range a little --- code/_globalvars/lists/maintenance_loot.dm | 10 ++++++++++ code/game/machinery/porta_turret/portable_turret.dm | 2 +- code/game/objects/items/stacks/medical.dm | 12 ++++++------ code/game/objects/items/storage/firstaid.dm | 12 ++++++++++-- code/modules/projectiles/projectile/bullets.dm | 2 +- code/modules/reagents/reagent_containers/pill.dm | 3 ++- 6 files changed, 30 insertions(+), 11 deletions(-) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index e7bf15e0..fd5b3ec0 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -114,6 +114,16 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/trash/fatoray_scrap1 = 1, //GS13 - added for researching fat guns /obj/item/trash/fatoray_scrap2 = 1, //GS13 /obj/item/trash/odd_disk = 1, //GS13 + /obj/item/clothing/neck/petcollar/calorite = 1, + /obj/item/reagent_containers/food/drinks/soda_cans/fizzwiz = 2, + /obj/item/clothing/mask/gas/fattening = 1, + /obj/item/stack/sheet/plastic/five = 1, + /obj/item/wrench/bronze = 1, + /obj/item/kitchen/knife/combat/bone = 1, + /obj/item/storage/pill_bottle/butt_enlargement = 1, + /obj/item/clothing/mask/cowmask/gag = 1, + /obj/item/clothing/mask/pig/gag = 1, + /obj/item/grown/bananapeel = 1, /obj/item/clothing/shoes/wheelys = 1, /obj/item/clothing/shoes/kindleKicks = 1, /obj/item/autosurgeon/penis = 1, diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index b2ff145e..3c9f8be8 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -641,7 +641,7 @@ always_up = 1 use_power = NO_POWER_USE has_cover = 0 - scan_range = 9 + scan_range = 8 req_access = list(ACCESS_SYNDICATE) mode = TURRET_LETHAL stun_projectile = /obj/item/projectile/bullet diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index c3568009..c1db69f7 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -125,9 +125,9 @@ icon_state = "brutepack" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - heal_brute = 15 - self_delay = 20 - grind_results = list(/datum/reagent/medicine/styptic_powder = 10) + heal_brute = 7 + self_delay = 30 + grind_results = list(/datum/reagent/medicine/styptic_powder = 5) /obj/item/stack/medical/bruise_pack/suicide_act(mob/user) user.visible_message("[user] is bludgeoning [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") @@ -181,9 +181,9 @@ icon_state = "ointment" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - heal_burn = 15 - self_delay = 20 - grind_results = list(/datum/reagent/medicine/silver_sulfadiazine = 10) + heal_burn = 7 + self_delay = 30 + grind_results = list(/datum/reagent/medicine/silver_sulfadiazine = 5) /obj/item/stack/medical/ointment/suicide_act(mob/living/user) user.visible_message("[user] is squeezing \the [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?") diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 12aa5559..dc764352 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -340,12 +340,20 @@ /obj/item/storage/pill_bottle/breast_enlargement name = "breast enlargement pills" - desc = "Made by Fermichem - They have a woman with breasts larger than she is on them. The warning states not to take more than 10u at a time." + desc = "Made by Fermichem - They have a woman with breasts larger than she is on them. The warning states not to take more than 30u at a time." /obj/item/storage/pill_bottle/breast_enlargement/PopulateContents() for(var/i in 1 to 7) new /obj/item/reagent_containers/pill/breast_enlargement(src) +/obj/item/storage/pill_bottle/butt_enlargement + name = "butt enlargement pills" + desc = "Made by Fermichem - They have a figure with an ass larger than they are on them. The warning states not to take more than 30u at a time." + +/obj/item/storage/pill_bottle/butt_enlargement/PopulateContents() + for(var/i in 1 to 7) + new /obj/item/reagent_containers/pill/butt_enlargement(src) + ///////////// //Organ Box// ///////////// @@ -413,4 +421,4 @@ /obj/item/storage/pill_bottle/paxpsych/PopulateContents() for(var/i in 1 to 5) - new /obj/item/reagent_containers/pill/paxpsych(src) \ No newline at end of file + new /obj/item/reagent_containers/pill/paxpsych(src) diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 6d030123..ec9c3471 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -1,7 +1,7 @@ /obj/item/projectile/bullet name = "bullet" icon_state = "bullet" - damage = 60 + damage = 55 damage_type = BRUTE nodamage = FALSE candink = TRUE diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 8ab37208..5fbfc84a 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -282,4 +282,5 @@ name = "butt enlargement pill" list_reagents = list(/datum/reagent/fermi/butt_enlarger = 10) price = 4 - icon_state = "pill_lewd" \ No newline at end of file + icon_state = "pill_lewd" + \ No newline at end of file