Post merge fixes.

This commit is contained in:
Neerti
2021-06-27 14:06:06 -04:00
parent a660aae770
commit c4b6243b05
2 changed files with 4 additions and 6 deletions
+4 -4
View File
@@ -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"
@@ -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()