Skip to content

Commit d8d2b94

Browse files
authored
Corrects instances of incorrect reagents for drinks (PentestSS13#258)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request A few mixtures were not properly modularized, also discovered a mistake that was not noticed during the great reset. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Corrects the instances makes things makeable. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: fix: Tranquility no longer can spawn removed sodas fix: Energy Birthday Cake now uses Power Game fix: Emagged Drink dispenser now dispenses Thirteen Loko fix: Shoal Mix now correctly uses Thirteen Loko /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
1 parent 3573010 commit d8d2b94

File tree

7 files changed

+21
-14
lines changed

7 files changed

+21
-14
lines changed

_maps/shuttles/independent/independent_tranquility.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -994,10 +994,10 @@
994994
},
995995
/obj/item/reagent_containers/food/drinks/soda_cans/molten,
996996
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
997+
/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime,
997998
/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
998999
/obj/item/reagent_containers/food/drinks/soda_cans/pwr_game,
999-
/obj/item/reagent_containers/food/drinks/soda_cans/random,
1000-
/obj/item/reagent_containers/food/drinks/soda_cans/random,
1000+
/obj/item/reagent_containers/food/drinks/soda_cans/sodawater,
10011001
/obj/item/reagent_containers/food/drinks/soda_cans/sodawater,
10021002
/obj/item/storage/cans/sixsoda,
10031003
/obj/item/reagent_containers/food/snacks/canned/beans,

code/game/objects/items/grenades/ghettobomb.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
check_parts = TRUE
3939

4040
/obj/item/grenade/iedcasing/spawned/Initialize()
41-
new /obj/item/reagent_containers/food/drinks/soda_cans/random(src)
41+
new /obj/item/reagent_containers/food/drinks/soda_cans(src)
4242
return ..()
4343

4444
/obj/item/grenade/iedcasing/CheckParts(list/parts_list)

code/modules/food_and_drinks/drinks/drinks.dm

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -558,17 +558,6 @@
558558
var/pierced = FALSE
559559
obj_flags = CAN_BE_HIT
560560

561-
/obj/item/reagent_containers/food/drinks/soda_cans/random/Initialize()
562-
..()
563-
var/T = pick(subtypesof(/obj/item/reagent_containers/food/drinks/soda_cans) - /obj/item/reagent_containers/food/drinks/soda_cans/random)
564-
new T(loc)
565-
return INITIALIZE_HINT_QDEL
566-
567-
/obj/item/reagent_containers/food/drinks/soda_cans/random/Initialize()
568-
..()
569-
var/T = pick(subtypesof(/obj/item/reagent_containers/food/drinks/soda_cans) - /obj/item/reagent_containers/food/drinks/soda_cans/random)
570-
new T(loc)
571-
return INITIALIZE_HINT_QDEL
572561

573562
/obj/item/reagent_containers/food/drinks/soda_cans/attack(mob/M, mob/user)
574563
if(istype(M, /mob/living/carbon) && !reagents.total_volume && user.a_intent == INTENT_HARM && user.zone_selected == BODY_ZONE_HEAD)
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/obj/item/food/cake/birthday/energy
2+
food_reagents = list(
3+
/datum/reagent/consumable/nutriment = 10,
4+
/datum/reagent/consumable/sprinkles = 10,
5+
/datum/reagent/consumable/nutriment/vitamin = 5,
6+
/datum/reagent/consumable/pwr_game = 10,
7+
/datum/reagent/consumable/liquidelectricity = 10
8+
)

modular_pentest/master_files/code/modules/reagents/chemistry/machinery/drink_dispenser.dm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,9 @@
2424
/datum/reagent/consumable/lemonjuice,
2525
/datum/reagent/consumable/menthol
2626
)
27+
emagged_reagents = list(
28+
/datum/reagent/consumable/ethanol/thirteenloko,
29+
/datum/reagent/consumable/ethanol/whiskey_cola,
30+
/datum/reagent/toxin/mindbreaker,
31+
/datum/reagent/toxin/staminatoxin
32+
)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/datum/chemical_reaction/shoalmix
2+
required_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 1, /datum/reagent/medicine/dimorlin = 2, /datum/reagent/phenol = 1, /datum/reagent/medicine/atropine = 2)

modular_pentest/~pentest.dme

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include "master_files\code\game\mecha\mech_fabricator.dm"
4646
#include "master_files\code\game\objects\items\circuitboards\machine_circuitboards.dm"
4747
#include "master_files\code\game\objects\items\devices\PDA\pda_types.dm"
48+
#include "master_files\code\game\objects\items\food\cake.dm"
4849
#include "master_files\code\game\objects\items\holy_weapons.dm"
4950
#include "master_files\code\game\objects\items\puzzle_pieces.dm"
5051
#include "master_files\code\game\objects\items\religion.dm"
@@ -127,6 +128,7 @@
127128
#include "master_files\code\modules\reagents\chemistry\reagents\base_drinks.dm"
128129
#include "master_files\code\modules\reagents\chemistry\reagents\drink_reagents.dm"
129130
#include "master_files\code\modules\reagents\chemistry\reagents\mixed_drinks.dm"
131+
#include "master_files\code\modules\reagents\chemistry\recipes\drugs.dm"
130132
#include "master_files\code\modules\reagents\chemistry\recipes\others.dm"
131133
#include "master_files\code\modules\research\bepis.dm"
132134
#include "master_files\code\modules\research\designs\AI_module_designs.dm"

0 commit comments

Comments
 (0)