From c4b6243b05acf15115fb841f2e46ac8e13715fbf Mon Sep 17 00:00:00 2001 From: Neerti Date: Sun, 27 Jun 2021 14:06:06 -0400 Subject: [PATCH] Post merge fixes. --- maps/cynosure/overmap/sectors.dm | 8 ++++---- maps/cynosure/structures/closets/security.dm | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/maps/cynosure/overmap/sectors.dm b/maps/cynosure/overmap/sectors.dm index e6b6b68c79..0fbcf97181 100644 --- a/maps/cynosure/overmap/sectors.dm +++ b/maps/cynosure/overmap/sectors.dm @@ -34,10 +34,10 @@ docking_codes = null /obj/effect/overmap/visitable/planet/Sif/get_skybox_representation() - . = ..() - (.).pixel_x = skybox_offset_x - (.).pixel_y = skybox_offset_y - + var/image/tmp = ..() + tmp.pixel_x = skybox_offset_x + tmp.pixel_y = skybox_offset_y + return tmp /obj/effect/overmap/visitable/telecomm_sat name = "Telecommunications Satellite" icon_state = "object" diff --git a/maps/cynosure/structures/closets/security.dm b/maps/cynosure/structures/closets/security.dm index 82b435e38a..40da8e0a75 100644 --- a/maps/cynosure/structures/closets/security.dm +++ b/maps/cynosure/structures/closets/security.dm @@ -130,8 +130,6 @@ starts_with += /obj/item/weapon/storage/backpack/satchel/sec if(prob(50)) starts_with += /obj/item/weapon/storage/backpack/dufflebag/sec - if(prob(30)) - starts_with += /obj/item/weapon/contraband/poster/nanotrasen return ..() /obj/structure/closet/secure_closet/security/cargo/Initialize()