cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-18 14:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2744 from Spamcat/bef

Browse Source 
fixes
This commit is contained in:
Mloc
2013-05-11 02:16:47 -07:00
parent 5b13445e95 17269494ef
commit 52583c53b2
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/alarm.dm
View File

@@ -131,7 +131,7 @@
return return
var/turf/simulated/location = loc var/turf/simulated/location = loc
ASSERT(istype(location)) if(!istype(location)) return//returns if loc is not simulated
var/datum/gas_mixture/environment = location.return_air() var/datum/gas_mixture/environment = location.return_air()
var/partial_pressure = R_IDEAL_GAS_EQUATION*environment.temperature/environment.volume var/partial_pressure = R_IDEAL_GAS_EQUATION*environment.temperature/environment.volume

21
code/game/mecha/working/ripley.dm
View File

@@ -111,13 +111,14 @@
/obj/mecha/working/ripley/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/mecha/working/ripley/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W, /obj/item/weapon/fluff/sven_fjeltson_1))//this shit broke ripleys
if(istype(W, /obj/item/weapon/fluff/sven_fjeltson_1)) src.icon_state = "earth"
src.icon_state = "earth" src.initial_icon = "earth"
src.initial_icon = "earth" src.name = "APLU \"Strike the Earth!\""
src.name = "APLU \"Strike the Earth!\"" src.desc = "Looks like an over worked, under maintained Ripley with some horrific damage."
src.desc = "Looks like an over worked, under maintained Ripley with some horrific damage." user << "You pick up your old \"Strike the Earth!\" APLU."
user << "You pick up your old \"Strike the Earth!\" APLU." user.drop_item()
user.drop_item() del(W)
del(W) return
return else
..()