mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
New plant and reagent: Squash (#36754)
* adds squash reagent * squash * squash tackle boosts * squash define * squash recipe for chemistry * squash icon * squash * squash namechange 1/2 * namechange 2/2
This commit is contained in:
@@ -527,6 +527,7 @@
|
||||
#define MIMOSA "mimosa"
|
||||
#define LEMONDROP "lemondrop"
|
||||
#define FEVERFEW "feverfew"
|
||||
#define SQUASH "squash"
|
||||
|
||||
#define ACRYLIC "acrylic"
|
||||
#define ACETONE "acetone"
|
||||
|
||||
@@ -359,6 +359,11 @@
|
||||
seed_type = "pumpkin"
|
||||
vending_cat = "vegetables"
|
||||
|
||||
/obj/item/seeds/squashseed
|
||||
name = "packet of slammed squash seeds"
|
||||
seed_type = "squash"
|
||||
vending_cat = "vegetables"
|
||||
|
||||
/obj/item/seeds/limeseed
|
||||
name = "packet of lime seeds"
|
||||
seed_type = "lime"
|
||||
@@ -1451,6 +1456,23 @@
|
||||
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin)
|
||||
harvest_repeat = 1
|
||||
chems = list(NUTRIMENT = list(1,6))
|
||||
mutants = list("squash")
|
||||
lifespan = 50
|
||||
maturation = 6
|
||||
production = 6
|
||||
yield = 3
|
||||
potency = 10
|
||||
growth_stages = 3
|
||||
fluid_consumption = 6
|
||||
|
||||
/datum/seed/squash
|
||||
name = "squash"
|
||||
seed_name = "squash"
|
||||
display_name = "slammed squash vine"
|
||||
plant_dmi = 'icons/obj/hydroponics/squash.dmi'
|
||||
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/squash)
|
||||
harvest_repeat = 1
|
||||
chems = list(NUTRIMENT = list(1,12), SQUASH = list(1,6)) //half of the nutrients turn into SQUASH
|
||||
|
||||
lifespan = 50
|
||||
maturation = 6
|
||||
|
||||
@@ -305,6 +305,8 @@
|
||||
tF += C.offenseTackleBonus()
|
||||
if(species)
|
||||
tF += species.tacklePower
|
||||
if(reagents.has_reagent(SQUASH))
|
||||
tF *= 1.5
|
||||
return tF
|
||||
|
||||
/mob/living/carbon/human/bonusTackleDefense(var/tD = 0)
|
||||
@@ -313,6 +315,8 @@
|
||||
tD += C.defenseTackleBonus()
|
||||
if(species)
|
||||
tD += species.tacklePower
|
||||
if(reagents.has_reagent(SQUASH))
|
||||
tD *= 1.5
|
||||
return tD
|
||||
|
||||
/mob/living/carbon/human/bonusTackleRange(var/tR = 0)
|
||||
@@ -325,6 +329,8 @@
|
||||
var/obj/item/slowSuit = wear_suit
|
||||
if(slowSuit.slowdown > NO_SLOWDOWN)
|
||||
tR -= 1
|
||||
if(reagents.has_reagent(SQUASH))
|
||||
tR *= 2
|
||||
if(reagents.get_sportiness()>=5)
|
||||
tR += 1
|
||||
return max(0, tR)
|
||||
|
||||
@@ -4225,5 +4225,12 @@
|
||||
required_catalysts = list(ZOMBIEPOWDER = 5)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/squash
|
||||
name = "Squash"
|
||||
id = SQUASH
|
||||
result = SQUASH
|
||||
required_reagents = list(MANLYDORF = 1, DEGENERATECALCIUM = 1, HYPERZINE = 1)
|
||||
result_amount = 2
|
||||
|
||||
#undef ALERT_AMOUNT_ONLY
|
||||
#undef ALERT_ALL_REAGENTS
|
||||
|
||||
@@ -569,6 +569,13 @@ var/list/strange_seed_product_blacklist = subtypesof(/obj/item/weapon/reagent_co
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/squash
|
||||
name = "slammed squash"
|
||||
desc = "Sometimes used to stop zombies invading your lawn."
|
||||
potency = 10
|
||||
filling_color = "#F5CD62"
|
||||
plantname = "squash"
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown/lime
|
||||
name = "lime"
|
||||
desc = "It's so sour, your face will twist."
|
||||
|
||||
@@ -508,3 +508,56 @@
|
||||
reagent_state = REAGENT_STATE_SOLID
|
||||
color = "#4c1e00" //rgb: 76, 30, 0
|
||||
density = 1.01
|
||||
|
||||
/datum/reagent/squash
|
||||
name = "Squash"
|
||||
id = SQUASH
|
||||
description = "High quality squash, makes you thick and stout, but can have extreme recoil on non-dwarves."
|
||||
reagent_state = REAGENT_STATE_LIQUID
|
||||
color = "#F5CD62" //rgb: 245, 205, 98
|
||||
density = 4 //thick?
|
||||
custom_metabolism = 0.05
|
||||
var/keklookatthisdude = 0
|
||||
|
||||
/datum/reagent/squash/on_mob_life(var/mob/living/M)
|
||||
if(..())
|
||||
return 1
|
||||
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(prob(1))
|
||||
H.say(pick("ROCK AND STONE!", "I am a dwarf and I'm digging a hole!"))
|
||||
if((H.dna.GetSEState(SMALLSIZEBLOCK)) == FALSE) //you skip all this shit if you are a dwarf
|
||||
switch(tick)
|
||||
if(1 to 15)
|
||||
H.adjustBruteLoss(rand(2,6))
|
||||
H.Jitter(5)
|
||||
if(prob(15) && H.feels_pain())
|
||||
to_chat(H, "<span class='warning'>Your bones itch!</span>")
|
||||
if(16 to INFINITY)
|
||||
if(!keklookatthisdude)
|
||||
H.dna.SetSEState(SMALLSIZEBLOCK, TRUE)
|
||||
domutcheck(H,null,MUTCHK_FORCED)
|
||||
to_chat(H,"<span class='warning'>You feel as tough as a dwarf and suddenly shrink!</span>")
|
||||
message_admins("Look at this dude: [key_name(M)] became tiny (on squash (dwarf reagent))! ([formatJumpTo(M)])")
|
||||
keklookatthisdude = 1
|
||||
|
||||
/datum/reagent/squash/reagent_deleted()
|
||||
if(..())
|
||||
return 1
|
||||
|
||||
if(!holder)
|
||||
return
|
||||
var/mob/M = holder.my_atom
|
||||
|
||||
if(ishuman(M))
|
||||
if(keklookatthisdude) //you skip this if you were a TRVE (gene) dwarf
|
||||
var/mob/living/carbon/human/H = M
|
||||
keklookatthisdude = 0
|
||||
H.dna.SetSEState(SMALLSIZEBLOCK, FALSE)
|
||||
domutcheck(H,null,MUTCHK_FORCED)
|
||||
for (var/datum/organ/external/E in H.organs)
|
||||
if(E.min_broken_damage == E.max_damage) //You went out of your way to harden your bones, your bones are safe
|
||||
return
|
||||
else
|
||||
E.fracture() //every bone in me body is broke - demoman
|
||||
|
||||
BIN
icons/obj/hydroponics/squash.dmi
Normal file
BIN
icons/obj/hydroponics/squash.dmi
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 929 B |
Reference in New Issue
Block a user