cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into medtweaks

Browse Source
This commit is contained in:
comma
2013-08-01 10:03:46 +04:00
parent bbdcb81868 50e7d9b450
commit 95f00d0523
85 changed files with 4012 additions and 2992 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/implants/implant.dm
+4
View File
@@ -461,3 +461,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
islegal()
return 0
/obj/item/weapon/implant/cortical
name = "cortical stack"
desc = "A fist-sized mass of biocircuits and chips."
code/game/objects/items/weapons/tanks/tank_types.dm
+2 -2
View File
@@ -29,7 +29,7 @@
..()
if(air_contents.oxygen < 10)
usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
playsound(usr, 'sound/effects/alert.ogg', 50, 1)
//playsound(usr, 'sound/effects/alert.ogg', 50, 1)
/obj/item/weapon/tank/oxygen/yellow
@@ -186,4 +186,4 @@
..()
if(air_contents.nitrogen < 10)
usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
playsound(usr, 'sound/effects/alert.ogg', 50, 1)
//playsound(usr, 'sound/effects/alert.ogg', 50, 1)