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

eating refactor (#3733) + bugfixes

Browse Source 
Ok, messed up resolving the merge conflicts (first try), so doing a
fresh pr. This turned out to be a good thing, as after I put the changes
back I tested again, and found 2 bugs (not due to my code)

Firstly, the organ refactor had introduced a bug when taking liver
damage from being drunk. It wasn't getting the liver correctly, leaving
it with null, and was then trying to damage it.

The second was related to the amount you took in when drinking
This commit is contained in:
VampyrBytes
2016-03-05 08:03:39 +00:00
parent ab490f7fd9
commit 1148bde3a6
25 changed files with 381 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+4 -4
View File
@@ -121,10 +121,10 @@
/obj/item/weapon/storage/pill_bottle/psychiatrist/New()
..()
new /obj/item/weapon/reagent_containers/pill/haloperidol(src)
new /obj/item/weapon/reagent_containers/pill/haloperidol(src)
new /obj/item/weapon/reagent_containers/pill/methamphetamine(src)
new /obj/item/weapon/reagent_containers/pill/methamphetamine(src)
new /obj/item/weapon/reagent_containers/food/pill/haloperidol(src)
new /obj/item/weapon/reagent_containers/food/pill/haloperidol(src)
new /obj/item/weapon/reagent_containers/food/pill/methamphetamine(src)
new /obj/item/weapon/reagent_containers/food/pill/methamphetamine(src)
/obj/structure/closet/secure_closet/psychiatrist
name = "psychiatrist's locker"