Conflicts!!!

This commit is contained in:
Artur
2020-06-22 17:39:24 +03:00
395 changed files with 84463 additions and 336540 deletions
+11 -11
View File
@@ -4919,11 +4919,11 @@
/area/maintenance/solars/port/fore)
"ajj" = (
/obj/structure/table,
/obj/item/stack/medical/ointment{
/obj/item/stack/medical/mesh{
pixel_x = 3;
pixel_y = -2
},
/obj/item/stack/medical/bruise_pack{
/obj/item/stack/medical/suture{
pixel_x = -3;
pixel_y = 2
},
@@ -46742,8 +46742,8 @@
/area/bridge/showroom/corporate)
"bOG" = (
/obj/structure/rack,
/obj/item/stack/medical/ointment,
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/mesh,
/obj/item/stack/medical/suture,
/obj/item/reagent_containers/syringe/charcoal,
/obj/item/reagent_containers/syringe/epinephrine{
pixel_x = -1;
@@ -52192,8 +52192,8 @@
"cap" = (
/obj/structure/table,
/obj/item/stack/medical/gauze,
/obj/item/stack/medical/ointment,
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/mesh,
/obj/item/stack/medical/suture,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
@@ -58770,11 +58770,11 @@
pixel_y = -1
},
/obj/item/reagent_containers/dropper,
/obj/item/stack/medical/bruise_pack{
/obj/item/stack/medical/suture{
pixel_x = -2;
pixel_y = 6
},
/obj/item/stack/medical/ointment,
/obj/item/stack/medical/mesh,
/obj/item/healthanalyzer,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
@@ -60360,9 +60360,9 @@
/obj/effect/decal/cleanable/blood/gibs/limb,
/obj/structure/rack,
/obj/item/storage/firstaid/regular,
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/ointment,
/obj/item/stack/medical/suture,
/obj/item/stack/medical/suture,
/obj/item/stack/medical/mesh,
/obj/item/clothing/glasses/hud/health,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)