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

Optimize a couple things

Browse Source
This commit is contained in:
Chompstation Bot
2021-07-20 21:30:20 +00:00
parent 4a6c523aa6
commit 15cafbe65b
262 changed files with 9437 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/nifsoft/software/05_health.dm
View File

@@ -115,11 +115,23 @@
//Needs fixing W << 'sound/voice/nifmedsynth_injured.ogg' //CHOMP Add
activate()
<<<<<<< HEAD
for(var/eo in nif.human.bad_external_organs)
var/obj/item/organ/external/EO = eo
for(var/w in EO.wounds)
var/datum/wound/W = w
if(W.damage <= 30) // Chomp Edit // The current limb break threshold.
||||||| parent of 0dcdc6d7d5... Merge pull request #11179 from VOREStation/Arokha/opt
for(var/eo in nif.human.bad_external_organs)
var/obj/item/organ/external/EO = eo
for(var/w in EO.wounds)
var/datum/wound/W = w
if(W.damage <= 5)
=======
for(var/obj/item/organ/external/EO as anything in nif.human.bad_external_organs)
for(var/datum/wound/W as anything in EO.wounds)
if(W.damage <= 5)
>>>>>>> 0dcdc6d7d5... Merge pull request #11179 from VOREStation/Arokha/opt
W.heal_damage(0.1)
EO.update_damages()
if(EO.update_icon())

26
code/modules/nifsoft/software/13_soulcatcher.dm
View File

@@ -75,10 +75,9 @@
to_chat(nif.human,"<b>\[[bicon(nif.big_icon)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\"")
nif.human << sound
for(var/brainmob in brainmobs)
var/mob/living/carbon/brain/caught_soul/CS = brainmob
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,"<b>\[[bicon(nif.big_icon)]NIF\]</b> <b>Soulcatcher</b> displays, \"<span class='notice nif'>[message]</span>\"")
brainmob << sound
CS << sound
/datum/nifsoft/soulcatcher/proc/say_into(var/message, var/mob/living/sender, var/mob/eyeobj)
var/sender_name = eyeobj ? eyeobj.name : sender.name
@@ -90,8 +89,7 @@
//Not AR Projecting
else
to_chat(nif.human,"<span class='game say nif'><b>\[[bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"</span>")
for(var/brainmob in brainmobs)
var/mob/living/carbon/brain/caught_soul/CS = brainmob
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,"<span class='game say nif'><b>\[[bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"</span>")
log_nsay(message,nif.human.real_name,sender)
@@ -106,8 +104,7 @@
//Not AR Projecting
else
to_chat(nif.human,"<span class='emote nif'><b>\[[bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> [message]</span>")
for(var/brainmob in brainmobs)
var/mob/living/carbon/brain/caught_soul/CS = brainmob
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,"<span class='emote nif'><b>\[[bicon(nif.big_icon)]NIF\]</b> <b>[sender_name]</b> [message]</span>")
log_nme(message,nif.human.real_name,sender)
@@ -135,8 +132,7 @@
new_flavor = sanitize(new_flavor, MAX_MESSAGE_LEN*2)
inside_flavor = new_flavor
nif.notify("Updating VR environment...")
for(var/brain in brainmobs)
var/mob/living/carbon/brain/caught_soul/CS = brain
for(var/mob/living/carbon/brain/caught_soul/CS as anything in brainmobs)
to_chat(CS,"<span class='notice'>Your surroundings change to...</span>\n[inside_flavor]")
save_settings()
return TRUE
@@ -179,24 +175,20 @@
nif.clear_flag(NIF_O_SCOTHERS,NIF_FLAGS_OTHER)
if(NIF_SC_ALLOW_EARS)
if(setting_flags & NIF_SC_ALLOW_EARS)
for(var/brain in brainmobs)
var/mob/living/carbon/brain/caught_soul/brainmob = brain
for(var/mob/living/carbon/brain/caught_soul/brainmob as anything in brainmobs)
brainmob.ext_deaf = FALSE
notify_message = "External audio input enabled."
else
for(var/brain in brainmobs)
var/mob/living/carbon/brain/caught_soul/brainmob = brain
for(var/mob/living/carbon/brain/caught_soul/brainmob as anything in brainmobs)
brainmob.ext_deaf = TRUE
notify_message = "External audio input disabled."
if(NIF_SC_ALLOW_EYES)
if(setting_flags & NIF_SC_ALLOW_EYES)
for(var/brain in brainmobs)
var/mob/living/carbon/brain/caught_soul/brainmob = brain
for(var/mob/living/carbon/brain/caught_soul/brainmob as anything in brainmobs)
brainmob.ext_blind = FALSE
notify_message = "External video input enabled."
else
for(var/brain in brainmobs)
var/mob/living/carbon/brain/caught_soul/brainmob = brain
for(var/mob/living/carbon/brain/caught_soul/brainmob as anything in brainmobs)
brainmob.ext_blind = TRUE
notify_message = "External video input disabled."