cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 21:46:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3145 from VOREStation/aro-nifexamine

Browse Source 
Readds NIF examine text
This commit is contained in:
Aronai Sieyes
2018-02-27 21:38:25 -05:00
committed by GitHub
parent eb5a1bd005 66f2acb931
commit d0fbc58100
5 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/examine.dm
+1 -1
View File
@@ -302,7 +302,7 @@
msg += attempt_vr(src,"examine_bellies",args) //VOREStation Code
msg += attempt_vr(src,"examine_pickup_size",args) //VOREStation Code
msg += attempt_vr(src,"examine_step_size",args) //VOREStation Code
msg += attempt_vr(src,"nif_examine",args) //VOREStation Code
msg += attempt_vr(src,"examine_nif",args) //VOREStation Code
if(mSmallsize in mutations)
msg += "[T.He] [T.is] small halfling!\n"
code/modules/mob/living/carbon/human/examine_vr.dm
+7 -12
View File
@@ -141,23 +141,18 @@
return FALSE
/mob/living/carbon/human/proc/examine_pickup_size(mob/living/carbon/human/H)
/mob/living/carbon/human/proc/examine_pickup_size(mob/living/H)
var/message = ""
if(isliving(src) && (H.get_effective_size() - src.get_effective_size()) >= 0.50)
if(istype(H) && (H.get_effective_size() - src.get_effective_size()) >= 0.50)
message = "<font color='blue'>They are small enough that you could easily pick them up!</font>\n"
return message
/mob/living/carbon/human/proc/examine_step_size(mob/living/carbon/human/H)
/mob/living/carbon/human/proc/examine_step_size(mob/living/H)
var/message = ""
if(isliving(src) && (H.get_effective_size() - src.get_effective_size()) >= 0.75)
if(istype(H) && (H.get_effective_size() - src.get_effective_size()) >= 0.75)
message = "<font color='red'>They are small enough that you could easily trample them!</font>\n"
return message
/mob/living/carbon/human/proc/nif_examine(mob/living/carbon/human/H)
var/message = ""
if(!src.nif || src.conceal_nif || !src.nif_examine) //Do they have a nif, do they have the NIF concealed, and do they have a NIF examine message?
return "" //If so, no message.
else
message += "[src.nif_examine]\n"
return message
/mob/living/carbon/human/proc/examine_nif(mob/living/carbon/human/H)
if(nif && nif.examine_msg) //If you have one set, anyway.
return "<span class='notice'>[nif.examine_msg]</span>\n"