Merged the old gs code with the new Hyper code

This commit is contained in:
KabKebab
2021-10-16 18:45:58 +02:00
parent 1c37b0652a
commit d1eda326c8
87 changed files with 940 additions and 54 deletions
@@ -83,7 +83,7 @@
/obj/effect/gluttony/CanPass(atom/movable/mover, turf/target)//So bullets will fly over and stuff.
if(ishuman(mover))
var/mob/living/carbon/human/H = mover
if(H.nutrition >= NUTRITION_LEVEL_FAT)
if(H.nutrition >= FATNESS_LEVEL_FAT)
H.visible_message("<span class='warning'>[H] pushes through [src]!</span>", "<span class='notice'>You've seen and eaten worse than this.</span>")
return TRUE
else
@@ -294,4 +294,4 @@
to_chat(user, "<span class='userdanger'>You feel overpowering pleasure surge through your entire body.</span>")
var/A = new /obj/item/reagent_containers/chalice/lust
user.put_in_hands(A)
chalice_taken = 1
chalice_taken = 1