Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trickwine refactor to use status effects #3390

Draft
wants to merge 22 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e6d6979
this is already so much better
FalloutFalcon May 3, 2024
517445d
alot better code, soon
FalloutFalcon May 5, 2024
5c7d62e
more buff to wine
FalloutFalcon May 5, 2024
a5eef19
al lof them
FalloutFalcon May 6, 2024
348addf
rewrite manuel
FalloutFalcon May 9, 2024
5698258
toggling ai like this was bad the line below it is even worse
FalloutFalcon Sep 19, 2024
a685891
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Sep 19, 2024
826e412
magic is not real.
FalloutFalcon Sep 19, 2024
56aad30
remind me to do this
FalloutFalcon Sep 19, 2024
44dfc4a
trickwine tweaks
FalloutFalcon Sep 24, 2024
93faa11
trait repath
FalloutFalcon Sep 24, 2024
1d27be7
yea
FalloutFalcon Sep 24, 2024
1a66c91
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Sep 24, 2024
4b05c93
dropshadow looks so much better then outline
FalloutFalcon Sep 24, 2024
e434063
tryna make hearth wines not remove all o2 from rooms
FalloutFalcon Sep 24, 2024
1381bbf
improvments to prism and force
FalloutFalcon Oct 29, 2024
9816422
trickwines cost more, keep moving for prism buff
FalloutFalcon Oct 29, 2024
561d877
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Dec 30, 2024
29bbd39
readds force and prism
FalloutFalcon Dec 30, 2024
78a0874
tweaks to prism, fix a compile eror
FalloutFalcon Dec 30, 2024
3d1e2ce
descriptioning
FalloutFalcon Dec 30, 2024
3e37a1e
unterminated text expecting "
FalloutFalcon Dec 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/__DEFINES/dcs/signals/signals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,8 @@
///sent when the access on an id is changed/updated, ensures wallets get updated once ids generate there access
#define COSMIG_ACCESS_UPDATED "acces_updated"

///sent by carbons to check if they can reflect a projectile
#define COMSIG_CHECK_REFLECT "check_reflect"
// Point of interest signals
/// Sent from base of /datum/controller/subsystem/points_of_interest/proc/on_poi_element_added : (atom/new_poi)
#define COMSIG_ADDED_POINT_OF_INTEREST "added_point_of_interest"
Expand Down
5 changes: 2 additions & 3 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
//non-mob traits
/// Used for limb-based paralysis, where replacing the limb will fix it.
#define TRAIT_PARALYSIS "paralysis"

/// Granted by prismwine, reflects lasers
#define TRAIT_REFLECTIVE "reflective"
#define TRAIT_HEARING_SENSITIVE "hearing_sensitive"

/*
Expand Down Expand Up @@ -446,8 +447,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_FISH_SAFE_STORAGE "fish_case"
/// Stuff that can go inside fish cases
#define TRAIT_FISH_CASE_COMPATIBILE "fish_case_compatibile"
/// Granted by prismwine
#define TRAIT_REFLECTIVE "reflective"
/// Self-explainatory.
#define BEAUTY_ELEMENT_TRAIT "beauty_element"
#define MOOD_COMPONENT_TRAIT "mood_component"
Expand Down
16 changes: 16 additions & 0 deletions code/game/objects/effects/effect_system/effects_foam.dm
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,22 @@
for(var/obj/item/Item in O)
Item.extinguish()

/obj/structure/foamedmetal/forcewine
name = "resin"
desc = "It's rapidly decaying!"
opacity = FALSE
icon_state = "atmos_resin"
alpha = 120
max_integrity = 10
var/timeleft = 50

/obj/structure/foamedmetal/forcewine/Initialize(mapload, new_timeleft)
. = ..()
if(new_timeleft)
timeleft = new_timeleft
if(timeleft)
QDEL_IN(src, timeleft)

#undef ALUMINIUM_FOAM
#undef IRON_FOAM
#undef RESIN_FOAM
2 changes: 1 addition & 1 deletion code/game/objects/effects/forcefields.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@
name = "resin"
icon_state = "atmos_resin"
CanAtmosPass = ATMOS_PASS_NO
timeleft = 1
timeleft = 50
1 change: 0 additions & 1 deletion code/game/objects/items/manuals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@

</body>
</html>"}

// Wiki books that are linked to the configured wiki link.

// A book that links to the wiki
Expand Down
16 changes: 10 additions & 6 deletions code/modules/cargo/blackmarket/blackmarket_items/consumables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,21 @@
desc = "The SRM keeps the recipes for their trickwines a closely guarded secret. The Hunters carrying those bottles? Less so."
item = /datum/reagent/consumable/ethanol/trickwine/ash_wine

price_min = 200
price_min = 300
price_max = 600
stock_min = 3
stock_max = 7
availability_prob = 40
availability_prob = 30

/datum/blackmarket_item/consumable/trickwine/spawn_item(loc)
var/trickwine = pick(list(/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine,
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine,
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine,))
var/trickwine = pick(list(
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/ashwine,
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/icewine,
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/shockwine,
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/hearthwine,
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine,
/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine
))
return new trickwine(loc)

/datum/blackmarket_item/consumable/stimpack
Expand Down
10 changes: 10 additions & 0 deletions code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,13 @@
name = "Vintage Hearthflame"
list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/hearth_wine = 45, /datum/reagent/consumable/ethanol/hcider = 5)
desc = "Hearthflame is one of the most important tonics devised by the SRM – both for its potent abilities in staunching wounds or setting enemies aflame, and for its closeness to the divine fire associated with the Ashen Huntsman."

/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/forcewine
name = "Vintage Saint-Roumain Forcewine"
list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/force_wine = 45, /datum/reagent/consumable/ethanol/tequila = 5)
desc = "Forcewine was originally created as a means to create temporary shelters during long tracking expeditions. While the structures proved to be not as versatile in shape as its brewers had hoped, its utility in creating barricades or heming in hostiles was still greatly appreciated."

/obj/item/reagent_containers/food/drinks/breakawayflask/vintage/prismwine
name = "Vintage Saint-Roumain Prismwine"
list_reagents = list(/datum/reagent/consumable/ethanol/trickwine/prism_wine = 45, /datum/reagent/consumable/ethanol/gin = 5)
desc = "Prismwine is one of the most recent additions to the Saint-Roumain Militia's reserve of trickwines. It was purpose-created for fighting hostiles that utilized more advanced energy projection attacks, such as the cryonic beams of watchers or the laser guns of interstellar pirates."
12 changes: 12 additions & 0 deletions code/modules/food_and_drinks/recipes/drinks_recipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,18 @@
required_container = /obj/structure/fermenting_barrel/distiller
mix_sound ='sound/items/welder.ogg'

/datum/chemical_reaction/force_wine
results = list(/datum/reagent/consumable/ethanol/trickwine/force_wine = 5)
required_reagents = list(/datum/reagent/consumable/ethanol/tequila = 3, /datum/reagent/calcium = 1, /datum/reagent/consumable/comet_trail = 1)
required_container = /obj/structure/fermenting_barrel/distiller
mix_sound ='sound/magic/forcewall.ogg'

/datum/chemical_reaction/prism_wine
results = list(/datum/reagent/consumable/ethanol/trickwine/prism_wine = 5)
required_reagents = list(/datum/reagent/consumable/ethanol/gin = 3, /datum/reagent/toxin/plasma = 1, /datum/reagent/consumable/tinlux = 1)
required_container = /obj/structure/fermenting_barrel/distiller
mix_sound ='sound/weapons/laser.ogg'

/datum/chemical_reaction/molten_bubbles
results = list(/datum/reagent/consumable/molten = 30)
required_reagents = list(/datum/reagent/clf3 = 10, /datum/reagent/consumable/space_cola = 20, /datum/reagent/medicine/leporazine = 1, /datum/reagent/medicine/lavaland_extract = 1)
Expand Down
5 changes: 3 additions & 2 deletions code/modules/mob/living/carbon/human/human_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,9 @@
for(var/obj/item/I in held_items)
if(I.IsReflect(def_zone))
return TRUE
///Granted by prismwine
if(HAS_TRAIT(src, TRAIT_REFLECTIVE) && prob(50))
if(SEND_SIGNAL(src, COMSIG_CHECK_REFLECT, def_zone))
return TRUE
if(HAS_TRAIT(src, TRAIT_REFLECTIVE))
return TRUE
return FALSE

Expand Down
5 changes: 3 additions & 2 deletions code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
#define ALCOHOL_THRESHOLD_MODIFIER 1 //Greater numbers mean that less alcohol has greater intoxication potential
#define ALCOHOL_RATE 0.005 //The rate at which alcohol affects you
#define ALCOHOL_EXPONENT 1.6 //The exponent applied to boozepwr to make higher volume alcohol at least a little bit damaging to the liver

#define ETHANOL_METABOLISM 0.5 * REAGENTS_METABOLISM
////////////// I don't know who made this header before I refactored alcohols but I'm going to fucking strangle them because it was so ugly, holy Christ
// ALCOHOLS //
//////////////


/datum/reagent/consumable/ethanol
name = "Ethanol"
description = "A well-known alcohol with a variety of applications."
color = "#404030" // rgb: 64, 64, 48
nutriment_factor = 0
taste_description = "alcohol"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
metabolization_rate = ETHANOL_METABOLISM
var/boozepwr = 65 //Higher numbers equal higher hardness, higher hardness equals more intense alcohol poisoning
accelerant_quality = 5

Expand Down
Loading
Loading