Skip to content

Commit

Permalink
Merge Tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
AyIong committed Jan 7, 2024
1 parent 91b2549 commit 99eee42
Show file tree
Hide file tree
Showing 14 changed files with 87 additions and 424 deletions.
12 changes: 6 additions & 6 deletions _maps/map_files220/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -22562,7 +22562,7 @@
"bCm" = (
/obj/machinery/economy/vending/cigarette{
pixel_y = 2;
products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate=7,/obj/item/storage/fancy/cigarettes/cigpack_uplift=3,/obj/item/storage/fancy/cigarettes/cigpack_robust=2,/obj/item/storage/fancy/cigarettes/cigpack_carp=3,/obj/item/storage/fancy/cigarettes/cigpack_midori=1,/obj/item/storage/box/matches=10,/obj/item/lighter/random=4)
products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate=7,/obj/item/storage/fancy/cigarettes/cigpack_uplift=3,/obj/item/storage/fancy/cigarettes/cigpack_robust=2,/obj/item/storage/fancy/cigarettes/cigpack_carp=3,/obj/item/storage/fancy/cigarettes/cigpack_midori=1,/obj/item/storage/fancy/matches=10,/obj/item/lighter/random=4)
},
/turf/simulated/floor/wood,
/area/station/command/office/captain)
Expand Down Expand Up @@ -24120,7 +24120,7 @@
/area/station/service/bar)
"bHQ" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/matches{
/obj/item/storage/fancy/matches{
pixel_y = 5
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -28891,7 +28891,7 @@
/area/station/science/robotics/showroom)
"bYg" = (
/obj/structure/table/wood,
/obj/item/storage/box/matches{
/obj/item/storage/fancy/matches{
pixel_x = -2;
pixel_y = 3
},
Expand Down Expand Up @@ -48305,7 +48305,7 @@
"eVz" = (
/obj/structure/table,
/obj/item/storage/fancy/rollingpapers,
/obj/item/storage/box/matches,
/obj/item/storage/fancy/matches,
/obj/item/seeds/tobacco,
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
Expand Down Expand Up @@ -70501,7 +70501,7 @@
/obj/item/toy/crayon/white{
pixel_y = -4
},
/obj/item/implanter{
/obj/item/bio_chip_implanter{
pixel_x = 5;
pixel_y = 12
},
Expand Down Expand Up @@ -71454,7 +71454,7 @@
/obj/item/candle{
pixel_x = -5
},
/obj/item/storage/box/matches{
/obj/item/storage/fancy/matches{
pixel_x = 1;
pixel_y = -1
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files220/RandomRuins/SpaceRuins/whiteship.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@
in_use = 1;
pixel_y = -9
},
/obj/item/clothing/suit/space/hardsuit/medical,
/obj/item/mod/control/pre_equipped/medical,
/turf/simulated/floor/mineral/titanium,
/area/shuttle/abandoned)
"oB" = (
Expand Down Expand Up @@ -974,7 +974,7 @@
/area/shuttle/abandoned)
"xr" = (
/obj/structure/rack,
/obj/item/clothing/suit/space/hardsuit/medical,
/obj/item/mod/control/pre_equipped/medical,
/obj/item/clothing/mask/breath,
/obj/machinery/atmospherics/unary/vent_scrubber{
name = "standard air scrubber";
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files220/RandomZLevels/blackmarketpackers.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4478,7 +4478,7 @@
/turf/simulated/floor/wood/oak,
/area/awaymission/BMPship/Armory)
"vl" = (
/obj/item/clothing/suit/space/hardsuit/medical,
/obj/item/mod/control/pre_equipped/medical,
/turf/space,
/area/space)
"vr" = (
Expand Down Expand Up @@ -6285,7 +6285,7 @@
/obj/item/storage/fancy/cigarettes/cigpack_med,
/obj/item/storage/fancy/cigarettes,
/obj/item/storage/fancy/cigarettes/dromedaryco,
/obj/item/storage/box/matches,
/obj/item/storage/fancy/matches,
/obj/machinery/light/small/directional/west,
/obj/structure/cable{
icon_state = "2-4"
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files220/RandomZLevels/gate_lizard.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -10099,7 +10099,7 @@
/obj/item/clothing/mask/balaclava,
/obj/item/clothing/head/officer,
/obj/item/clothing/under/color/red,
/obj/item/storage/box/matches,
/obj/item/storage/fancy/matches,
/obj/structure/closet,
/obj/item/storage/fancy/cigarettes/cigpack_robust,
/obj/item/storage/belt/fannypack,
Expand Down Expand Up @@ -14012,7 +14012,7 @@
"rHT" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass,
/obj/item/storage/box/matches,
/obj/item/storage/fancy/matches,
/obj/effect/decal/cleanable/cobweb2,
/obj/item/clothing/mask/cigarette/pipe,
/turf/simulated/floor/wood/oak,
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files220/RandomZLevels/wildwest.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3117,7 +3117,7 @@
icon_state = "mining"
},
/obj/item/clothing/under/plasmaman/mining,
/obj/item/clothing/suit/space/hardsuit/mining,
/obj/item/mod/control/pre_equipped/mining/asteroid,
/turf/simulated/floor/wood/oak,
/area/awaymission/wildwest/wildwest_mines)
"ED" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files220/cyberiad/cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -22015,7 +22015,7 @@
"bIM" = (
/obj/structure/table/wood,
/obj/item/radio/intercom/directional/south,
/obj/item/storage/box/matches,
/obj/item/storage/fancy/matches,
/obj/item/reagent_containers/food/drinks/flask/gold,
/obj/item/clothing/mask/cigarette/cigar,
/obj/item/razor{
Expand Down Expand Up @@ -55839,7 +55839,7 @@
"hpP" = (
/obj/structure/table,
/obj/item/storage/fancy/rollingpapers,
/obj/item/storage/box/matches,
/obj/item/storage/fancy/matches,
/obj/item/seeds/tobacco,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
Expand Down Expand Up @@ -68494,7 +68494,7 @@
/obj/item/reagent_containers/syringe/heparin{
pixel_y = 4
},
/obj/item/implanter/mindshield{
/obj/item/bio_chip_implanter/mindshield{
pixel_y = 1;
pixel_x = -2
},
Expand Down
10 changes: 5 additions & 5 deletions _maps/map_files220/delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2626,7 +2626,7 @@
/area/station/maintenance/electrical_shop)
"aqx" = (
/obj/structure/table/wood,
/obj/item/storage/box/matches,
/obj/item/storage/fancy/matches,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/electrical_shop)
"aqy" = (
Expand Down Expand Up @@ -54795,7 +54795,7 @@
pixel_x = 5;
pixel_y = 5
},
/obj/item/storage/box/matches,
/obj/item/storage/fancy/matches,
/obj/machinery/light/directional/north,
/obj/structure/sign/barsign{
pixel_y = 32
Expand Down Expand Up @@ -76847,7 +76847,7 @@
"naA" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
/obj/item/storage/box/matches,
/obj/item/storage/fancy/matches,
/obj/item/storage/fancy/cigarettes/cigpack_robust,
/obj/effect/spawner/lootdrop/maintenance/three,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -80776,7 +80776,7 @@
pixel_x = -11;
pixel_y = -2
},
/obj/item/implanter/mindshield{
/obj/item/bio_chip_implanter/mindshield{
pixel_y = 11;
pixel_x = -7
},
Expand Down Expand Up @@ -82472,7 +82472,7 @@
/area/station/supply/miningdock)
"oJQ" = (
/obj/structure/table/wood,
/obj/item/storage/box/matches,
/obj/item/storage/fancy/matches,
/obj/machinery/light/small/directional/south,
/turf/simulated/floor/plasteel/grimy,
/area/station/security/permabrig)
Expand Down
16 changes: 8 additions & 8 deletions _maps/map_files220/generic/Admin_Zone.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3348,32 +3348,32 @@
/area/holodeck/source_snowfield)
"WD" = (
/obj/structure/table/wood,
/obj/item/implanter/adrenalin{
/obj/item/bio_chip_implanter/adrenalin{
pixel_x = 12;
pixel_y = -12
},
/obj/item/implanter/emp{
/obj/item/bio_chip_implanter/emp{
pixel_x = 9;
pixel_y = -9
},
/obj/item/implanter/explosive{
/obj/item/bio_chip_implanter/explosive{
pixel_x = 6;
pixel_y = -6
},
/obj/item/implanter/explosive_macro{
/obj/item/bio_chip_implanter/explosive_macro{
pixel_x = 3;
pixel_y = -3
},
/obj/item/implanter/freedom,
/obj/item/implanter/krav_maga{
/obj/item/bio_chip_implanter/freedom,
/obj/item/bio_chip_implanter/krav_maga{
pixel_x = -9;
pixel_y = 9
},
/obj/item/implanter/mindshield{
/obj/item/bio_chip_implanter/mindshield{
pixel_x = -6;
pixel_y = 6
},
/obj/item/implanter/storage{
/obj/item/bio_chip_implanter/storage{
pixel_x = -3;
pixel_y = 3
},
Expand Down
Loading

0 comments on commit 99eee42

Please sign in to comment.