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

New plant trait and dank vescicles bug fix #2342

Merged
merged 21 commits into from
Sep 20, 2024

Conversation

RafRoq
Copy link
Contributor

@RafRoq RafRoq commented Jun 20, 2024

About The Pull Request

adds a new plat gene trait called Catalytic Inhibitor Serum only available in the traitor uplink for 20tc, fixes a bug with dank vesciles and densified chemicals interaction, densified chemicals sometimes overrided dank vesciles and when it did not override, it was not properly multiplying the max volume by 2

EDIT: removed the potency limiter gene because it was literaly doing nothing(buged) but causing any plant with densified chemicals to have limited potency instead(buged), i dont believe there is a reason for that gene to exist right now

Why It's Good For The Game

Bug fix about an expected behavior, and adds new powerful trait gated by antagonist role for 20tc in the uplink, if you see a botanicist blowing stuff up with potwat reaction then he is valid.

Changelog

🆑
add: new plant trait catalytic inhibitor serum
add: new job restricted traitor uplink item, plant data disk with catalytic inhibitor serum gene for 20tc
fix: fixed Dank Vesicles and densified chemicals interaction
remove: potency limiter gene
code: potency limiter gene code removed
🆑

@RafRoq RafRoq closed this Jun 21, 2024
@RafRoq RafRoq reopened this Jun 21, 2024
@RafRoq
Copy link
Contributor Author

RafRoq commented Jun 22, 2024

.

@RafRoq
Copy link
Contributor Author

RafRoq commented Jun 22, 2024

fixed, this PR is ready for merge

@RafRoq RafRoq closed this Jun 23, 2024
@RafRoq RafRoq reopened this Jun 23, 2024
code/modules/uplink/uplink_items/job.dm Outdated Show resolved Hide resolved
code/modules/hydroponics/unique_plant_genes.dm Outdated Show resolved Hide resolved
code/modules/hydroponics/grown.dm Outdated Show resolved Hide resolved
code/modules/hydroponics/grown.dm Outdated Show resolved Hide resolved
code/modules/hydroponics/plant_genes.dm Outdated Show resolved Hide resolved
code/modules/hydroponics/grown.dm Outdated Show resolved Hide resolved
code/modules/hydroponics/gene_modder.dm Outdated Show resolved Hide resolved
code/modules/hydroponics/grown.dm Outdated Show resolved Hide resolved
code/modules/hydroponics/grown.dm Outdated Show resolved Hide resolved
code/modules/hydroponics/grown.dm Outdated Show resolved Hide resolved
@RafRoq
Copy link
Contributor Author

RafRoq commented Jul 2, 2024

@ancient-engineer solved your comments

@RafRoq RafRoq closed this Jul 2, 2024
@RafRoq RafRoq reopened this Jul 2, 2024
@RafRoq RafRoq closed this Jul 2, 2024
@RafRoq
Copy link
Contributor Author

RafRoq commented Jul 2, 2024

You cant really move the new plantgene disk to monkstation folder

@RafRoq RafRoq reopened this Jul 2, 2024
@RafRoq
Copy link
Contributor Author

RafRoq commented Jul 2, 2024

ready i guess

wraith-54321 pushed a commit to wraith-54321/Monkestation2.0 that referenced this pull request Aug 9, 2024
…ng, weapon, rite (#74811)

![image](https://user-images.githubusercontent.com/40974010/232647927-aace69ea-bda8-4ec9-9bf1-60140034fbb3.png)

Adds a new chaplain weapon and suit of armor, the divine archer. It's an
orderable set of armor, but provides less armor than the rest, but you
get more pieces of armor (boots, bracer, undersuit).

The divine bow comes with a quiver that holds holy arrows. The holy
arrows come with bane support, dealing critical damage to revenants.

- arrows can now be dipped in poison

- bows now drop their arrow when you put them on your back while nocking
a bow
- bows give feedback for trying to draw without a nocked arrow
- codewise, bows support subtypes much better. They still have
hard-sprited loaded arrows, but one day that'll change.

Yeah, we could add null rod Monkestation#2342 that does almost the same as the
others, or we could have a unique bow weapon!

Player Dev Project thread:
https://discord.com/channels/326822144233439242/1093521091957370940/1093521091957370940

🆑 tralezab code, Drag for the commission and player project, cre#0484
for their spritework
add: Divine Archer Armor and Weapon
qol: Bows give more feedback when you're doing something wrong, like
trying to draw without a nocked arrow
code: Sorted files, cleaned bow code up to allow subtypes
/:cl:
Copy link
Member

@Absolucy Absolucy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix conflicts

@RafRoq
Copy link
Contributor Author

RafRoq commented Sep 19, 2024

fix conflicts

Done

@@ -426,6 +426,10 @@
var/read_only = 0 //Well, it's still a floppy disk
obj_flags = UNIQUE_RENAME

/obj/item/disk/plantgene/syndicate // Monkestation item
gene = new /datum/plant_gene/trait/noreact
read_only = 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
read_only = 1
read_only = TRUE

@@ -426,6 +426,10 @@
var/read_only = 0 //Well, it's still a floppy disk
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
var/read_only = 0 //Well, it's still a floppy disk
var/read_only = FALSE //Well, it's still a floppy disk

fix this while ya here i guess

@@ -63,3 +63,11 @@
pod.custom_objective = objective
pod.RefreshParts()
pod.locked = TRUE // The pod shouldn't be eligible for cloner event.

/datum/uplink_item/role_restricted/syndicate_plant_gene
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is silly, but can you move this further up in the file, so I can TM this without conflicts?

@Absolucy
Copy link
Member

fuck it we ball

@Absolucy Absolucy merged commit c16d146 into Monkestation:master Sep 20, 2024
23 checks passed
Absolucy added a commit to Absolucy/Monkestation that referenced this pull request Sep 20, 2024
@RafRoq
Copy link
Contributor Author

RafRoq commented Sep 20, 2024

fuck it we ball

Based, first server to bring back separated chems, monkestation making history

@Absolucy
Copy link
Member

this cannot possibly go wrong

@RafRoq
Copy link
Contributor Author

RafRoq commented Sep 20, 2024

this cannot possibly go wrong

I mean, it's 20 telecrystals, job gated and monkestation rules don't really allow someone to go around and make the station unhabitable with tomatos, it's fine

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants