cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes (#1214, #1219, #1174, #1185, #1202, #1170) (#1274)

Browse Source 
Fixes #1214 
Fixes #1219 
Fixes #1174 
Fixes #1185 
Fixes #1202 
Fixes #1170
This commit is contained in:
printer16
2016-12-24 04:14:00 +02:00
committed by skull132
parent 6cef8c9074
commit 657ca8acb3
7 changed files with 56 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/posters/bs12.dm
+9 -9
View File
@@ -288,42 +288,42 @@
icon_state="bsposter58"
name = "space bear information poster"
desc = "This poster displays a picture of a legendary space bear."
/datum/poster/bay_59
icon_state = "bsposter59"
name = "ATLAS poster"
desc = "ATLAS: For all of Humanity."
/datum/poster/bay_60
icon_state = "bsposter60"
name = "N.S.S. Aurora"
desc = "This poster is a picture of the old, now defunct, N.S.S. Aurora. Commissioned in 2454 and decommissioned in the early days of 2458."
/datum/poster/bay_61
icon_state = "bsposter61"
name = "Xenobiology Safety Protocols"
desc = "This posters warms the crew about the dangers of xenobiology outbreaks."
/datum/poster/bay_62
icon_state = "bsposter62"
name = "Xenobiology Division"
desc = "This one depicts a green skrell research director doing autopsy on an alien lifeform."
/datum/poster/bay_63
icon_state = "bsposter63"
name = "Suit Sensors"
desc = "This particular one depicts a female doctor tending to an injured crewmember. It says; \"Remember to enable your suit sensors!\"."
/datum/poster/bay_64
icon_state = "bsposter64"
name = "Maintenance Drones"
desc = "This particular one depicts a maintenance drone. It reminders the crew to don't disturb them when they are doing repairs."
desc = "This particular one depicts a maintenance drone. It reminds the crew to don't disturb them when they are doing repairs."
/datum/poster/bay_65
icon_state = "bsposter65"
name = "Importance of Plasma"
desc = "A corporate morale poster showing three forms of plasma. Teaching the very basics of this really important substance."
/datum/poster/bay_66
icon_state = "bsposter66"
name = "BFG 9000"
code/game/objects/items/devices/PDA/PDA.dm
+5 -2
View File
@@ -1005,10 +1005,13 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/who = src.owner
if(prob(50))
who = P.owner
for(var/mob/living/silicon/ai/ai in mob_list)
// Allows other AIs to intercept the message but the AI won't intercept their own message.
if(ai.aiPDA != P && ai.aiPDA != src)
ai.show_message("<i>Intercepted message from <b>[who]</b>: [t]</i>")
if(who != P.owner)
ai.show_message("<i>Intercepted message to <b>[who]</b>: [t]</i>")
else
ai.show_message("<i>Intercepted message from <b>[who]</b>: [t]</i>")
P.new_message_from_pda(src, t)
nanomanager.update_user_uis(U, src) // Update the sending user's PDA UI so that they can see the new message
code/game/objects/items/weapons/tanks/jetpack.dm
+9 -1
View File
@@ -11,6 +11,7 @@
var/datum/effect/effect/system/ion_trail_follow/ion_trail
var/on = 0.0
var/stabilization_on = 0
var/warned = 0
var/volume_rate = 500 //Needed for borg jetpack transfer
action_button_name = "Toggle Jetpack"
@@ -27,7 +28,6 @@
. = ..()
if(air_contents.total_moles < 5)
user << "<span class='danger'>The meter on \the [src] indicates you are almost out of gas!</span>"
playsound(user, 'sound/effects/alert.ogg', 50, 1)
/obj/item/weapon/tank/jetpack/verb/toggle_rockets()
set name = "Toggle Jetpack Stabilization"
@@ -65,6 +65,14 @@
src.ion_trail.stop()
return 0
if (src.air_contents.total_moles < 3 && !warned)
warned = 1
playsound(user, 'sound/effects/alert.ogg', 50, 1)
user << "<span class='danger'>The meter on \the [src] indicates you are almost out of gas and beeps loudly!</span>"
spawn(600)
warned = 0
var/datum/gas_mixture/G = src.air_contents.remove(num)