cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 07:28:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12291 from Heroman3003/8330-fix

Browse Source 
8330 fix
This commit is contained in:
Casey
2022-02-19 17:32:34 -05:00
committed by GitHub
parent 9c7c1d507e 9a9f77fa3c
commit 08e35faab0
11 changed files with 1652 additions and 1198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/hardware/network_card.dm
+1 -1
View File
@@ -103,7 +103,7 @@ var/global/ntnet_card_uid = 1
var/holderz = get_z(holder2)
if(!holderz) //no reception in nullspace
return 0
var/list/zlevels_in_range = using_map.get_map_levels(holderz, FALSE)
var/list/zlevels_in_range = using_map.get_map_levels(holderz, FALSE)// VOREStation Edit - , om_range = DEFAULT_OVERMAP_RANGE)
var/list/zlevels_in_long_range = using_map.get_map_levels(holderz, TRUE, om_range = DEFAULT_OVERMAP_RANGE) - zlevels_in_range
var/best = 0
for(var/obj/machinery/ntnet_relay/R as anything in ntnet_global.relays)
code/modules/overmap/ships/landable.dm
+3 -4
View File
@@ -199,11 +199,10 @@
switch(status)
if(SHIP_STATUS_LANDED)
var/obj/effect/overmap/visitable/location = loc
if(istype(loc, /obj/effect/overmap/visitable/sector))
return "Landed on \the [location.name]. Use secondary thrust to get clear before activating primary engines."
if(istype(loc, /obj/effect/overmap/visitable/ship))
if(location.in_space)
return "Docked with \the [location.name]. Use secondary thrust to get clear before activating primary engines."
return "Docked with an unknown object."
else
return "Landed on \the [location.name]. Use secondary thrust to get clear before activating primary engines."
if(SHIP_STATUS_TRANSIT)
return "Maneuvering under secondary thrust."
if(SHIP_STATUS_OVERMAP)
code/modules/paperwork/paper.dm
+9 -4
View File
@@ -106,11 +106,16 @@
//lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm!
/obj/item/weapon/paper/Initialize(mapload)
. = ..()
/obj/item/weapon/paper/Initialize(mapload, var/text, var/title)
. = ..()
if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player.
was_maploaded = TRUE
if(istext(title))
name = title
if(istext(text))
info = text
if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player.
was_maploaded = TRUE
/obj/item/weapon/paper/New(var/newloc, var/text, var/title)
..()