cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-05 23:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #161 from SkyMarshal/master

Browse Source 
Added air pressure define for disposals, minor map edit, removed Deathgasp from emotes.
This commit is contained in:
Albert Iordache
2011-12-28 00:57:37 -08:00
parent c282fa259b 28752b4410
commit 83f5e93768
3 changed files with 7622 additions and 7617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/carbon/human/emote.dm
View File

@@ -183,9 +183,10 @@
message = "<B>[src]</B> makes a weak noise."
m_type = 2
if ("deathgasp")
/* if ("deathgasp")
message = "<B>[src]</B> seizes up and falls limp, \his eyes dead and lifeless..."
m_type = 1
m_type = 1 */
//No. --SkyMarshal
if ("giggle")
if (!muzzled)

9
code/modules/recycling/disposal.dm
View File

@@ -5,6 +5,7 @@
// Automatically recharges air (unless off), will flush when ready if pre-set
// Can hold items and human size things, no other draggables
// Toilets are a type of disposal bin for small objects only and work on magic. By magic, I mean torque rotation
#define SEND_PRESSURE 0.05*ONE_ATMOSPHERE
/obj/machinery/disposal
name = "disposal unit"
@@ -190,7 +191,7 @@
else
dat += "Pump: <A href='?src=\ref[src];pump=0'>Off</A> <B>On</B> (idle)<BR>"
var/per = 100* air_contents.return_pressure() / (2*ONE_ATMOSPHERE)
var/per = 100* air_contents.return_pressure() / (SEND_PRESSURE)
dat += "Pressure: [round(per, 1)]%<BR></body>"
@@ -284,7 +285,7 @@
src.updateDialog()
if(flush && air_contents.return_pressure() >= 2*ONE_ATMOSPHERE) // flush can happen even without power
if(flush && air_contents.return_pressure() >= SEND_PRESSURE) // flush can happen even without power
flush()
if(stat & NOPOWER) // won't charge if no power
@@ -301,7 +302,7 @@
var/atom/L = loc // recharging from loc turf
var/datum/gas_mixture/env = L.return_air()
var/pressure_delta = (ONE_ATMOSPHERE*2.1) - air_contents.return_pressure()
var/pressure_delta = (SEND_PRESSURE*1.01) - air_contents.return_pressure()
if(env.temperature > 0)
var/transfer_moles = 0.1 * pressure_delta*air_contents.volume/(env.temperature * R_IDEAL_GAS_EQUATION)
@@ -312,7 +313,7 @@
// if full enough, switch to ready mode
if(air_contents.return_pressure() >= 2*ONE_ATMOSPHERE)
if(air_contents.return_pressure() >= SEND_PRESSURE)
mode = 2
update()
return