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

Lousy goddamn indentation.

Browse Source
This commit is contained in:
Zuhayr
2014-05-03 21:09:55 +09:30
parent 378e6865d4
commit c526b9c29a
3 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/reagents/reagent_containers/food/drinks.dm
View File

@@ -28,11 +28,11 @@
if(M == user) if(M == user)
if(istype(M,/mob/living/carbon/human)) if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
if(H.species.flags & IS_SYNTHETIC) if(H.species.flags & IS_SYNTHETIC)
H << "\red You have a monitor for a head, where do you think you're going to put that?" H << "\red You have a monitor for a head, where do you think you're going to put that?"
return return
M << "\blue You swallow a gulp of [src]." M << "\blue You swallow a gulp of [src]."
if(reagents.total_volume) if(reagents.total_volume)
@@ -42,10 +42,10 @@
return 1 return 1
else if( istype(M, /mob/living/carbon/human) ) else if( istype(M, /mob/living/carbon/human) )
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
if(H.species.flags & IS_SYNTHETIC) if(H.species.flags & IS_SYNTHETIC)
H << "\red They have a monitor for a head, where do you think you're going to put that?" H << "\red They have a monitor for a head, where do you think you're going to put that?"
return return
for(var/mob/O in viewers(world.view, user)) for(var/mob/O in viewers(world.view, user))
O.show_message("\red [user] attempts to feed [M] [src].", 1) O.show_message("\red [user] attempts to feed [M] [src].", 1)

24
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -39,15 +39,13 @@
return 0 return 0
if(istype(M, /mob/living/carbon)) if(istype(M, /mob/living/carbon))
var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25)
if(M == user) //If you're eating it yourself if(M == user) //If you're eating it yourself
if(istype(M,/mob/living/carbon/human))
if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M
var/mob/living/carbon/human/H = M if(H.species.flags & IS_SYNTHETIC)
if(H.species.flags & IS_SYNTHETIC) H << "\red You have a monitor for a head, where do you think you're going to put that?"
H << "\red You have a monitor for a head, where do you think you're going to put that?" return
return
.
var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25)
if (fullness <= 50) if (fullness <= 50)
M << "\red You hungrily chew out a piece of [src] and gobble it!" M << "\red You hungrily chew out a piece of [src] and gobble it!"
if (fullness > 50 && fullness <= 150) if (fullness > 50 && fullness <= 150)
@@ -61,13 +59,13 @@
return 0 return 0
else else
if(istype(M,/mob/living/carbon/human)) if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
if(H.species.flags & IS_SYNTHETIC) if(H.species.flags & IS_SYNTHETIC)
H << "\red They have a monitor for a head, where do you think you're going to put that?" H << "\red They have a monitor for a head, where do you think you're going to put that?"
return return
if(!istype(M, /mob/living/carbon/slime)) //If you're feeding it to someone else. if(!istype(M, /mob/living/carbon/slime)) //If you're feeding it to someone else.
var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25)
if (fullness <= (550 * (1 + M.overeatduration / 1000))) if (fullness <= (550 * (1 + M.overeatduration / 1000)))
for(var/mob/O in viewers(world.view, user)) for(var/mob/O in viewers(world.view, user))
O.show_message("\red [user] attempts to feed [M] [src].", 1) O.show_message("\red [user] attempts to feed [M] [src].", 1)

16
code/modules/reagents/reagent_containers/pill.dm
View File

@@ -22,10 +22,10 @@
if(M == user) if(M == user)
if(istype(M, /mob/living/carbon/human)) if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
if(H.species.flags & IS_SYNTHETIC) if(H.species.flags & IS_SYNTHETIC)
H << "\red You have a monitor for a head, where do you think you're going to put that?" H << "\red You have a monitor for a head, where do you think you're going to put that?"
return return
M << "\blue You swallow [src]." M << "\blue You swallow [src]."
M.drop_from_inventory(src) //icon update M.drop_from_inventory(src) //icon update
@@ -38,10 +38,10 @@
else if(istype(M, /mob/living/carbon/human) ) else if(istype(M, /mob/living/carbon/human) )
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
if(H.species.flags & IS_SYNTHETIC) if(H.species.flags & IS_SYNTHETIC)
H << "\red They have a monitor for a head, where do you think you're going to put that?" H << "\red They have a monitor for a head, where do you think you're going to put that?"
return return
for(var/mob/O in viewers(world.view, user)) for(var/mob/O in viewers(world.view, user))
O.show_message("\red [user] attempts to force [M] to swallow [src].", 1) O.show_message("\red [user] attempts to force [M] to swallow [src].", 1)