cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 05:57:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Atmos analyser now fit on belt.

Browse Source 
Emergency oxygentank's volume was reduced, initial pressure was increased, distribution pressure was set to 21.
Internals icon was fixed.
Also, now you can activate weared internals by clicking on icon.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@763 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-01-04 00:35:40 +00:00
parent d2bb7d63ba
commit a233cf5f25
6 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human.dm
+9 -2
View File
@@ -2448,17 +2448,24 @@
if (src.target.internal)
src.target.internal.add_fingerprint(src.source)
src.target.internal = null
if (src.target.internals)
src.target.internals.icon_state = "internal0"
else
if (src.target.internal)
src.target.internal = null
if (!( istype(src.target.wear_mask, /obj/item/clothing/mask) ))
return
else
if (istype(src.target.back, /obj/item/weapon/tank))
src.target.internal = src.target.back
else if (istype(src.target.s_store, /obj/item/weapon/tank))
src.target.internal = src.target.s_store
else if (istype(src.target.belt, /obj/item/weapon/tank))
src.target.internal = src.target.belt
if (src.target.internal)
for(var/mob/M in viewers(src.target, 1))
M.show_message(text("[] is now running on internals.", src.target), 1)
src.target.internal.add_fingerprint(src.source)
if (src.target.internals)
src.target.internals.icon_state = "internal1"
else
if(src.source)
src.source.update_clothing()
code/modules/mob/living/carbon/human/life.dm
+2 -2
View File
@@ -250,8 +250,8 @@
if (!wear_mask || !(wear_mask.flags & MASKINTERNALS) )
internal = null
if(internal)
if (src.internals)
src.internals.icon_state = "internal1"
//if (src.internals) //should be unnecessary, uncomment if it isn't. -raftaf0
// src.internals.icon_state = "internal1"
return internal.remove_air_volume(volume_needed)
else
if (src.internals)
code/modules/mob/mob.dm
+24 -1
View File
@@ -803,7 +803,30 @@
usr.machine = null
if("internal")
if ((!( usr.stat ) && usr.canmove && !( usr.restrained() )))
usr.internal = null
if (usr.internal)
usr.internal = null
if (usr.internals)
usr.internals.icon_state = "internal0"
else
if (!( istype(usr.wear_mask, /obj/item/clothing/mask) ))
return
else
if (istype(usr.back, /obj/item/weapon/tank))
usr.internal = usr.back
else if (ishuman(usr) && istype(usr:s_store, /obj/item/weapon/tank))
usr.internal = usr:s_store
else if (ishuman(usr) && istype(usr:belt, /obj/item/weapon/tank))
usr.internal = usr:belt
else if (istype(usr.l_hand, /obj/item/weapon/tank))
usr.internal = usr.l_hand
else if (istype(usr.r_hand, /obj/item/weapon/tank))
usr.internal = usr.r_hand
if (usr.internal)
//for(var/mob/M in viewers(usr, 1))
// M.show_message(text("[] is now running on internals.", usr), 1)
usr << "You are now running on internals."
if (usr.internals)
usr.internals.icon_state = "internal1"
if("pull")
usr.pulling = null
if("sleep")