cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes (#12166)

Browse Source 
* Fixes #3143

* Fixes #12015

* Fixes #9261

* Fixes #12057
This commit is contained in:
BarneyGumball
2016-10-12 03:17:01 +10:00
committed by clusterfack
parent a27f6b947f
commit d30bcd697e
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/defines/obj.dm
View File

@@ -362,9 +362,9 @@ var/global/list/PDA_Manifest = list()
if(sleeptime > world.time)
if(ismob(A))
var/mob/living/L = A
if(L.client)
L.client.move_delayer.next_allowed = sleeptime //So we don't need to check timestopped in client/move
if(L.mind != owner)
if(L.client)
L.client.move_delayer.next_allowed = sleeptime //So we don't need to check timestopped in client/move
if(!L.stat)
L.playsound_local(src, theworld == 1 ? 'sound/effects/theworld2.ogg' : 'sound/effects/fall2.ogg', 100, 0, 0, 0, 0)
//L.Paralyse(round(((sleeptime - world.time)/10)/2, 1))

1
code/game/objects/structures/crates_lockers/closets/statue.dm
View File

@@ -57,6 +57,7 @@
M.adjustFireLoss(intialFire - M.getFireLoss())
M.adjustBruteLoss(intialBrute - M.getBruteLoss())
M.setOxyLoss(intialOxy)
M.Paralyse(2)
if (timer <= 0)
dump_contents()
processing_objects.Remove(src)

8
code/modules/power/lighting.dm
View File

@@ -285,13 +285,13 @@ var/global/list/obj/machinery/light/alllights = list()
..()
switch(status)
if(LIGHT_OK)
to_chat(user, "<span class='info'>[desc] It is turned [on? "on" : "off"].</span>")
to_chat(user, "<span class='info'>It is turned [on? "on" : "off"].</span>")
if(LIGHT_EMPTY)
to_chat(user, "<span class='info'>[desc] The [fitting] has been removed.</span>")
to_chat(user, "<span class='info'>The [fitting] has been removed.</span>")
if(LIGHT_BURNED)
to_chat(user, "<span class='info'>[desc] The [fitting] is burnt out.</span>")
to_chat(user, "<span class='info'>The [fitting] is burnt out.</span>")
if(LIGHT_BROKEN)
to_chat(user, "<span class='info'>[desc] The [fitting] has been smashed.</span>")
to_chat(user, "<span class='info'>The [fitting] has been smashed.</span>")
// attack with item - insert light (if right type), otherwise try to break the light

4
html/changelogs/BarneyGumball.yml
View File

@@ -1,2 +1,4 @@
author: BarneyGumball
changes: []
changes:
- bugfix: Time Stop no longer affects the wizard who casts it.
- bugfix: "You can no longer use your PDA when you're a statue."

2
nano/templates/air_alarm.tmpl
View File

@@ -216,7 +216,7 @@ Used In File(s): /code/game/machinery/alarm.dm
<div class="statusDisplay">
{{for data.presets}}
<div class="line">
<div class="statusLabel">{{:helper.link(value.name,'gear',{'preset':index+1},null,(index+1==value.preset?'linkOn':''))}}</div>
<div class="statusLabel">{{:helper.link(value.name,'gear',{'preset':index+1},null,(index+1==data.preset?'linkOn':''))}}</div>
<div class="statusValue">
{{:value.desc}}
</div>