cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Patches and pills are now no longer subtypes of food (#23063)

Browse Source 
* Part 2 - feeding others doesn't work as intended

* Part 3: fixing force feeding

* Fixes patches being wack

* Makes this less ass

* Adds patches to the chemistry bag

* Update code/modules/mob/living/carbon/carbon.dm

* Update code/modules/mob/living/carbon/carbon.dm

* Some missed patches

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Fixes IPC logic

* Henri Review

* Add updatepaths

* Jimkil review

* IPCs now aren't allowed to eat pills and get patch

* Update code/modules/mob/living/carbon/carbon.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/patch.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/carbon.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
DGamerL
2023-11-21 16:37:16 +01:00
committed by GitHub
parent ba44b18102
commit 307120e7d3
28 changed files with 285 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm
+19 -19
View File
@@ -97,25 +97,25 @@
// Why the hell is this in the closets folder?
/obj/item/storage/pill_bottle/psychiatrist/populate_contents()
new /obj/item/reagent_containers/food/pill/haloperidol(src)
new /obj/item/reagent_containers/food/pill/haloperidol(src)
new /obj/item/reagent_containers/food/pill/haloperidol(src)
new /obj/item/reagent_containers/food/pill/methamphetamine(src)
new /obj/item/reagent_containers/food/pill/methamphetamine(src)
new /obj/item/reagent_containers/food/pill/methamphetamine(src)
new /obj/item/reagent_containers/food/pill/happy_psych(src)
new /obj/item/reagent_containers/food/pill/happy_psych(src)
new /obj/item/reagent_containers/food/pill/happy_psych(src)
new /obj/item/reagent_containers/food/pill/patch/nicotine(src)
new /obj/item/reagent_containers/food/pill/patch/nicotine(src)
new /obj/item/reagent_containers/food/pill/patch/nicotine(src)
new /obj/item/reagent_containers/food/pill/hydrocodone(src)
new /obj/item/reagent_containers/food/pill/hydrocodone(src)
new /obj/item/reagent_containers/food/pill/mannitol(src)
new /obj/item/reagent_containers/food/pill/mannitol(src)
new /obj/item/reagent_containers/food/pill/mannitol(src)
new /obj/item/reagent_containers/food/pill/mannitol(src)
new /obj/item/reagent_containers/food/pill/mannitol(src)
new /obj/item/reagent_containers/pill/haloperidol(src)
new /obj/item/reagent_containers/pill/haloperidol(src)
new /obj/item/reagent_containers/pill/haloperidol(src)
new /obj/item/reagent_containers/pill/methamphetamine(src)
new /obj/item/reagent_containers/pill/methamphetamine(src)
new /obj/item/reagent_containers/pill/methamphetamine(src)
new /obj/item/reagent_containers/pill/happy_psych(src)
new /obj/item/reagent_containers/pill/happy_psych(src)
new /obj/item/reagent_containers/pill/happy_psych(src)
new /obj/item/reagent_containers/patch/nicotine(src)
new /obj/item/reagent_containers/patch/nicotine(src)
new /obj/item/reagent_containers/patch/nicotine(src)
new /obj/item/reagent_containers/pill/hydrocodone(src)
new /obj/item/reagent_containers/pill/hydrocodone(src)
new /obj/item/reagent_containers/pill/mannitol(src)
new /obj/item/reagent_containers/pill/mannitol(src)
new /obj/item/reagent_containers/pill/mannitol(src)
new /obj/item/reagent_containers/pill/mannitol(src)
new /obj/item/reagent_containers/pill/mannitol(src)
/obj/structure/closet/secure_closet/psychiatrist
name = "psychiatrist's locker"