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

A few fixes.

Browse Source
This commit is contained in:
Head
2012-07-28 17:16:22 +02:00
parent b6c4e9e9be
commit 3a1f30ece4
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/ZAS/Connection.dm
View File

@@ -190,6 +190,9 @@ connection
return 1 return 1
proc/UpdateZones() //Changes connection data in the zones if it is required. proc/UpdateZones() //Changes connection data in the zones if it is required.
if(istype(A,/turf/space) || istype(B,/turf/space))
src.Cleanup()
return
if(A.ZAirPass(B)) if(A.ZAirPass(B))
var/door_pass = A.CanPass(null,B,1.5,1) var/door_pass = A.CanPass(null,B,1.5,1)
if(door_pass || A.CanPass(null,B,0,0)) if(door_pass || A.CanPass(null,B,0,0))

2
code/game/objects/effect_system.dm
View File

@@ -195,7 +195,7 @@ steam.start() -- spawns the effect
if(src.total_sparks > 20) if(src.total_sparks > 20)
return return
spawn(0) spawn(0)
if(holder) if(holder || !istype(holder,/datum))
src.location = get_turf(holder) src.location = get_turf(holder)
var/obj/effect/effect/sparks/sparks = new /obj/effect/effect/sparks(src.location) var/obj/effect/effect/sparks/sparks = new /obj/effect/effect/sparks(src.location)
src.total_sparks++ src.total_sparks++

5
code/game/objects/items/weapons/implants/implanter.dm
View File

@@ -114,8 +114,7 @@
..() ..()
/obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob) /obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob)
if(istype(A,/obj/item)) if(istype(A,/obj/item) && imp)
var/obj/item/weapon/implant/compressed/c = imp imp:scanned = A
c.scanned = A
A.loc.contents.Remove(A) A.loc.contents.Remove(A)
update() update()

2
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -253,7 +253,7 @@
if (timeleft) if (timeleft)
stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]") stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
if(ticker.mode.name == "AI malfunction") if(ticker.mode && ticker.mode.name == "AI malfunction")
var/datum/game_mode/malfunction/malf = ticker.mode var/datum/game_mode/malfunction/malf = ticker.mode
for (var/datum/mind/malfai in malf.malf_ai) for (var/datum/mind/malfai in malf.malf_ai)
if(connected_ai) if(connected_ai)