Skip to content

Commit

Permalink
ADD: Adding some Plasma Rifle and IFAKs
Browse files Browse the repository at this point in the history
  • Loading branch information
800maximum123 committed Jun 7, 2024
1 parent d0684ca commit a231b60
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions maps/torch_fd/torch1_deck5.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
"cu" = (/obj/floor_decal/techfloor{dir = 8},/obj/floor_decal/techfloor{dir = 4},/obj/machinery/door/airlock/hatch,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/techfloor/grid,/area/exploration_shuttle/power)
"cv" = (/obj/structure/bed/chair/shuttle/blue{dir = 4},/obj/floor_decal/corner/purple_dark/border{dir = 9},/obj/machinery/camera/network/fifth_deck{dir = 4},/obj/machinery/button/alternate/door/bolts{id_tag = "charon_cockpit"; name = "Emergency Cockpit Release"; pixel_x = -25; req_access = list("ACCESS_EXPLO_HELM")},/turf/simulated/floor/tiled/dark/monotile,/area/exploration_shuttle/airlock)
"cw" = (/obj/floor_decal/corner/purple_dark/border{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/dark/monotile,/area/exploration_shuttle/airlock)
"cx" = (/obj/floor_decal/corner/mauve/mono,/obj/floor_decal/industrial/outline/yellow,/obj/machinery/light{dir = 8},/obj/structure/closet/secure_closet/explorer/medic,/obj/item/material/hatchet/machete,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration)
"cx" = (/obj/floor_decal/corner/mauve/mono,/obj/floor_decal/industrial/outline/yellow,/obj/machinery/light{dir = 8},/obj/structure/closet/secure_closet/explorer/medic,/obj/item/material/hatchet/machete,/obj/item/storage/firstaid/individual/military,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration)
"cy" = (/obj/floor_decal/industrial/warning/corner,/turf/simulated/floor/tiled/monotile,/area/quartermaster/hangar)
"cz" = (/obj/floor_decal/industrial/warning/corner,/obj/floor_decal/corner/purple_dark/border{dir = 1},/obj/machinery/computer/modular/preset/medical,/turf/simulated/floor/tiled/dark/monotile,/area/exploration_shuttle/airlock)
"cA" = (/obj/overmap/visitable/ship/landable/guppy,/obj/machinery/atmospherics/pipe/manifold/visible{dir = 8},/obj/structure/cable/cyan,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/obj/machinery/power/terminal{dir = 8},/obj/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled/techfloor/grid,/area/guppy_hangar/start)
Expand Down Expand Up @@ -365,7 +365,7 @@
"hj" = (/obj/floor_decal/corner_techfloor_gray{dir = 9},/obj/floor_decal/borderfloorblack/corner,/obj/floor_decal/corner_techfloor_gray{dir = 4},/obj/floor_decal/industrial/warning{dir = 8},/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/portables_connector,/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/tiled/steel_ridged,/area/butterfly_hangar)
"hk" = (/obj/floor_decal/industrial/outline/yellow,/obj/machinery/mining/brace{dir = 8},/turf/simulated/floor/tiled/dark/monotile,/area/quartermaster/expedition/storage)
"hl" = (/obj/wallframe_spawn/no_grille,/turf/simulated/floor/plating,/area/quartermaster/exploration)
"hm" = (/obj/structure/closet/secure_closet/pilot,/obj/floor_decal/industrial/outline/yellow,/obj/structure/sign/ecplaque{pixel_y = 30},/obj/item/material/hatchet/machete,/obj/machinery/camera/network/fifth_deck{c_tag = "Pilot's Lounge"; dir = 4},/turf/simulated/floor/tiled/dark/monotile,/area/command/pilot)
"hm" = (/obj/structure/closet/secure_closet/pilot,/obj/floor_decal/industrial/outline/yellow,/obj/structure/sign/ecplaque{pixel_y = 30},/obj/item/material/hatchet/machete,/obj/machinery/camera/network/fifth_deck{c_tag = "Pilot's Lounge"; dir = 4},/obj/item/storage/firstaid/individual/military,/turf/simulated/floor/tiled/dark/monotile,/area/command/pilot)
"hn" = (/obj/floor_decal/industrial/outline/yellow,/obj/machinery/suspension_gen,/turf/simulated/floor/tiled/dark/monotile,/area/quartermaster/expedition/storage)
"ho" = (/obj/random/junk,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/fifthdeck/aftstarboard)
"hp" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/turf/simulated/floor/plating,/area/maintenance/fifthdeck/aftstarboard)
Expand All @@ -376,7 +376,7 @@
"hu" = (/obj/structure/railing/mapped,/turf/simulated/floor/tiled/monotile,/area/hallway/primary/fifthdeck/fore)
"hv" = (/obj/floor_decal/corner/brown/half{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/monotile,/area/hallway/primary/fifthdeck/fore)
"hw" = (/obj/floor_decal/corner/mauve{dir = 5},/turf/simulated/floor/tiled,/area/quartermaster/exploration)
"hx" = (/obj/machinery/firealarm{pixel_y = 24},/obj/floor_decal/corner/mauve/mono,/obj/structure/closet/secure_closet/explorer,/obj/floor_decal/industrial/outline/yellow,/obj/item/material/hatchet/machete,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration)
"hx" = (/obj/machinery/firealarm{pixel_y = 24},/obj/floor_decal/corner/mauve/mono,/obj/structure/closet/secure_closet/explorer,/obj/floor_decal/industrial/outline/yellow,/obj/item/material/hatchet/machete,/obj/item/storage/firstaid/individual/military,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration)
"hy" = (/turf/simulated/floor/wood/walnut,/area/vacant/bar)
"hz" = (/turf/simulated/floor/tiled,/area/quartermaster/exploration)
"hA" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/random/trash,/obj/structure/railing/mapped{dir = 4; icon_state = "railing0-1"},/turf/simulated/floor/plating,/area/maintenance/fifthdeck/aftstarboard)
Expand Down Expand Up @@ -513,9 +513,9 @@
"ke" = (/obj/machinery/atmospherics/pipe/simple/hidden/fuel{dir = 9},/obj/paint/green,/turf/simulated/wall/titanium,/area/butterfly_hangar)
"kf" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/quartermaster/exploration)
"kg" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/quartermaster/exploration)
"kh" = (/obj/floor_decal/corner/mauve/mono,/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/explorer/engineer,/obj/item/material/hatchet/machete,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration)
"kh" = (/obj/floor_decal/corner/mauve/mono,/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/floor_decal/industrial/outline/yellow,/obj/structure/closet/secure_closet/explorer/engineer,/obj/item/material/hatchet/machete,/obj/item/storage/firstaid/individual/military,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration)
"ki" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/exploration)
"kj" = (/obj/floor_decal/corner/mauve/mono,/obj/structure/closet/secure_closet/explorer,/obj/floor_decal/industrial/outline/yellow,/obj/item/material/hatchet/machete,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration)
"kj" = (/obj/floor_decal/corner/mauve/mono,/obj/structure/closet/secure_closet/explorer,/obj/floor_decal/industrial/outline/yellow,/obj/item/material/hatchet/machete,/obj/item/storage/firstaid/individual/military,/turf/simulated/floor/tiled/monotile,/area/quartermaster/exploration)
"kk" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor/tiled,/area/quartermaster/exploration)
"kl" = (/turf/unsimulated/mask,/area/hallway/primary/fifthdeck/fore)
"km" = (/obj/floor_decal/corner_techfloor_gray{dir = 9},/obj/floor_decal/borderfloorblack{dir = 4},/obj/floor_decal/industrial/warning{dir = 8},/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/handrail{dir = 4},/obj/machinery/atmospherics/pipe/simple/visible/fuel,/turf/simulated/floor/tiled/steel_ridged,/area/butterfly_hangar)
Expand Down
2 changes: 1 addition & 1 deletion maps/torch_fd/torch2_deck4.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1682,7 +1682,7 @@
"Gy" = (/obj/shuttle_landmark/torch/deck1/butterfly,/turf/space,/area/space)
"Gz" = (/obj/landmark/test/space_turf,/turf/space,/area/space)
"Hj" = (/obj/floor_decal/techfloor{dir = 1},/turf/simulated/floor/tiled/techfloor,/area/quartermaster/storage/upper)
"Sj" = (/obj/floor_decal/techfloor{dir = 1},/obj/structure/closet/crate/secure/weapon{req_access = list("ACCESS_QUARTERMASTER")},/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/obj/item/cell/device/high,/turf/simulated/floor/tiled/techfloor,/area/quartermaster/storage/upper)
"Sj" = (/obj/floor_decal/techfloor{dir = 1},/obj/structure/closet/crate/secure/weapon{req_access = list("ACCESS_QUARTERMASTER")},/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/gun/energy/k342,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/obj/item/cell/guncell,/turf/simulated/floor/tiled/techfloor,/area/quartermaster/storage/upper)

(1,1,1) = {"
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
Expand Down
Loading

0 comments on commit a231b60

Please sign in to comment.