cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Thank you Raeschen

Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
FluffMedic
2023-07-13 08:16:15 -04:00
committed by GitHub
parent bf839969f4
commit 638aedaf1d
3 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modular_chomp/code/game/objects/items/weapons/storage/firstaid.dm
View File

@@ -10,7 +10,8 @@
/obj/item/weapon/storage/pill_bottle/juggernog, /obj/item/weapon/storage/pill_bottle/juggernog,
/obj/item/weapon/storage/pill_bottle/curea, /obj/item/weapon/storage/pill_bottle/curea,
/obj/item/weapon/storage/pill_bottle/souldew, /obj/item/weapon/storage/pill_bottle/souldew,
/obj/item/weapon/storage/pill_bottle/puriyfingagent) /obj/item/weapon/storage/pill_bottle/purifyingagent)
/obj/item/weapon/storage/pill_bottle/neotane /obj/item/weapon/storage/pill_bottle/neotane
name = "pill bottle (neo kelotane)" name = "pill bottle (neo kelotane)"
@@ -48,16 +49,20 @@
starts_with = list(/obj/item/weapon/reagent_containers/pill/souldew = 7) starts_with = list(/obj/item/weapon/reagent_containers/pill/souldew = 7)
wrapper_color = COLOR_GREEN wrapper_color = COLOR_GREEN
/obj/item/weapon/storage/pill_bottle/puriyfingagent /obj/item/weapon/storage/pill_bottle/purifyingagent
name = "pill bottle (puriyfing agent)"
name = "pill bottle (purifying agent)"
desc = "Contains experimental pills." desc = "Contains experimental pills."
starts_with = list(/obj/item/weapon/reagent_containers/pill/puriyfingagent = 7) starts_with = list(/obj/item/weapon/reagent_containers/pill/purifyingagent = 7)
wrapper_color = COLOR_GREEN wrapper_color = COLOR_GREEN
//Pills //Pills
/obj/item/weapon/reagent_containers/pill/neotane /obj/item/weapon/reagent_containers/pill/neotane
name = "Neo Kelotane (15u)" name = "Neo Kelotane (15u)"
desc = "An expirmental pill." desc = "An experimental pill."
icon_state = "pill2" icon_state = "pill2"
/obj/item/weapon/reagent_containers/pill/neotane/Initialize() /obj/item/weapon/reagent_containers/pill/neotane/Initialize()
@@ -115,12 +120,15 @@
reagents.add_reagent("souldew", 10) reagents.add_reagent("souldew", 10)
color = reagents.get_color() color = reagents.get_color()
/obj/item/weapon/reagent_containers/pill/puriyfingagent /obj/item/weapon/reagent_containers/pill/purifyingagent
name = "Puriyfing Agent (10u)" name = "Purifying Agent (10u)"
desc = "An expirmental pill." desc = "An expirmental pill."
icon_state = "pill2" icon_state = "pill2"
/obj/item/weapon/reagent_containers/pill/puriyfingagent/Initialize() /obj/item/weapon/reagent_containers/pill/purifyingagent/Initialize()
. = ..() . = ..()
reagents.add_reagent("puriyfingagent", 10) reagents.add_reagent("purifyingagent", 10)
color = reagents.get_color() color = reagents.get_color()

16
modular_chomp/code/modules/reagents/reactions/instant/instant.dm
View File

@@ -67,10 +67,10 @@
required_reagents = list("neoliquidfire" = 1, "glucose" = 1, "hydrogen" = 1) required_reagents = list("neoliquidfire" = 1, "glucose" = 1, "hydrogen" = 1)
result_amount = 2 result_amount = 2
/decl/chemical_reaction/instant/puriyfingagent /decl/chemical_reaction/instant/purifyingagent
name = "Puriyfing Agent" name = "Purifying Agent"
id = "puriyfingagent" id = "purifyingagent"
result = "puryfingagent" result = "purifyingagent"
required_reagents = list("deathblood" = 1, "carthatoline" = 1, "hyronalin" = 1) required_reagents = list("deathblood" = 1, "carthatoline" = 1, "hyronalin" = 1)
result_amount = 2 result_amount = 2
@@ -119,9 +119,9 @@
required_reagents = list("bicard" = 1, "kelotane" = 1, "liquidlife" = 1, "carpotoxin" = 1, "quadcord" = 1, "cryptobiolin" = 1) required_reagents = list("bicard" = 1, "kelotane" = 1, "liquidlife" = 1, "carpotoxin" = 1, "quadcord" = 1, "cryptobiolin" = 1)
result_amount = 6 result_amount = 6
/decl/chemical_reaction/instant/phoneixbreath /decl/chemical_reaction/instant/phoenixbreath
name = "phoneixbreath" name = "phoenixbreath"
id = "phoneixbreath" id = "phoenixbreath"
result = "phoneixbreath" result = "phoenixbreath"
required_reagents = list("vermicetol" = 1, "liquidlife" = 1, "neoliquidfire" = 1, "souldew" = 1, "phoron" = 1, "dermaline" = 1) required_reagents = list("vermicetol" = 1, "liquidlife" = 1, "neoliquidfire" = 1, "souldew" = 1, "phoron" = 1, "dermaline" = 1)
result_amount = 6 result_amount = 6

6
modular_chomp/code/modules/reagents/reagents/medicine.dm
View File

@@ -87,7 +87,7 @@
/datum/reagent/purifyingagent /datum/reagent/purifyingagent
name = "Purifying Agent" name = "Purifying Agent"
id = "puriyfingagent" id = "purifyingagent"
description = "An agent that purges one's body of rads and toxins." description = "An agent that purges one's body of rads and toxins."
reagent_state = LIQUID reagent_state = LIQUID
color = "#225722" color = "#225722"
@@ -175,7 +175,7 @@
/datum/reagent/neotane /datum/reagent/neotane
name = "Neo Kelotane" name = "Neo Kelotane"
id = "neotane" id = "neotane"
description = "An advancment of kelotane that scars and breaks apart the users flesh to remove the burnt tissue." description = "An advancement of kelotane that scars and breaks apart the user's flesh to remove the burnt tissue."
taste_description = "bitterness" taste_description = "bitterness"
reagent_state = LIQUID reagent_state = LIQUID
color = "#FF6600" color = "#FF6600"
@@ -308,7 +308,7 @@
/datum/reagent/curea /datum/reagent/curea
name = "curea" name = "curea"
id = "curea" id = "curea"
description = "An experimental that removes many aligments, such as poison and stiffing of muscles via frost" description = "An experimental that removes many ailments, such as poison and stiffening of muscles via frost"
taste_description = "bitterness" taste_description = "bitterness"
reagent_state = LIQUID reagent_state = LIQUID
color = "#660066" color = "#660066"