Skip to content

Commit

Permalink
Merge branch 'campaign' into freelancer-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
VoiceInYourHead authored Aug 14, 2024
2 parents b7b6347 + 94f9f4d commit f4cee59
Show file tree
Hide file tree
Showing 18 changed files with 1,765 additions and 784 deletions.
3 changes: 3 additions & 0 deletions code/game/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,9 @@
S = pick('sound/voice/pred_pain1.ogg','sound/voice/pred_pain2.ogg','sound/voice/pred_pain3.ogg','sound/voice/pred_pain4.ogg','sound/voice/pred_pain5.ogg',5;'sound/voice/pred_pain_rare1.ogg')
if("clownstep")
S = pick('sound/effects/clownstep1.ogg', 'sound/effects/clownstep2.ogg')
//RUCM START
if("male_clf_warcry")
S = pick('sound/voice/clf_warcry/warcry_male_1.ogg')
return S

/client/proc/generate_sound_queues()
Expand Down
7 changes: 5 additions & 2 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -496,8 +496,11 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
return

//RU-PVE ADDITION STARTS
if(istype(attacking_item, /obj/item/cell/apc))
var/obj/item/cell/apc/power_source = attacking_item
if(istype(attacking_item, /obj/item/cell))
var/obj/item/cell/power_source = attacking_item
if(power_source.charge <= 0)
to_chat(user, SPAN_DANGER("[power_source] is empty! You can't charge [src] visor with it!"))
return
for(var/obj/item/device/helmet_visor/night_vision/nvg in (built_in_visors + inserted_visors))
if(do_after(user, 10 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
nvg.power_cell.charge += power_source.charge
Expand Down
9 changes: 6 additions & 3 deletions code/modules/vehicles/interior/interactable/seats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,12 @@
unslashable = FALSE
unacidable = TRUE

var/buckle_offset_x = 0
//RU-PVE ADDITION STARTS
/* var/buckle_offset_x = 0
var/mob_old_x = 0
var/buckle_offset_y = 0
var/mob_old_y = 0
var/mob_old_y = 0*/
//RU-PVE ADDITION ENDS

/obj/structure/bed/chair/vehicle/Initialize()
. = ..()
Expand All @@ -324,7 +326,8 @@

handle_rotation()

/obj/structure/bed/chair/vehicle/proc/setup_buckle_offsets()
// /obj/structure/bed/chair/vehicle/proc/setup_buckle_offsets()
/obj/structure/bed/chair/vehicle/setup_buckle_offsets() //RU-PVE
if(pixel_x != 0)
buckle_offset_x = pixel_x
if(pixel_y != 0)
Expand Down
4 changes: 4 additions & 0 deletions colonialmarines.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2497,7 +2497,9 @@
#include "interface\skin.dmf"
#include "maps\_basemap.dm"
#include "maps\map_files\LV671_Ark\LV671.dm"
#include "maps\map_files\USCSS_Tortuga\tortuga_areas.dm"
#include "void-marines\code\admin_tools.dm"
#include "void-marines\code\chair_shifting.dm"
#include "void-marines\code\factory_areas.dm"
#include "void-marines\code\light_change.dm"
#include "void-marines\code\loadouts.dm"
Expand All @@ -2509,8 +2511,10 @@
#include "void-marines\code\modules\mob\living\carbon\human\emote.dm"
#include "void-marines\code\playable_factions\alt_roles.dm"
#include "void-marines\code\playable_factions\areas.dm"
#include "void-marines\code\playable_factions\fl_mod_items.dm"
#include "void-marines\code\playable_factions\fl_presets.dm"
#include "void-marines\code\playable_factions\lancer.dm"
#include "void-marines\code\playable_factions\fl_vendors.dm"
#include "void-marines\code\playable_factions\pmc_presets.dm"
#include "void-marines\code\playable_factions\shuttles.dm"
#include "void-marines\code\playable_factions\stuff.dm"
Expand Down
3 changes: 3 additions & 0 deletions map_config/shipmaps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,7 @@ map lead_hawk
endmap

map corsair
endmap

map tortuga
endmap
340 changes: 0 additions & 340 deletions maps/map_files/Corsair/uscss_tortuga.dmm

This file was deleted.

45 changes: 45 additions & 0 deletions maps/map_files/USCSS_Tortuga/tortuga_areas.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/area/tortuga
icon = 'icons/turf/area_almayer.dmi'
icon_state = "almayer"
ceiling = CEILING_METAL
powernet_name = "tortuga"
sound_environment = SOUND_ENVIRONMENT_ROOM
soundscape_interval = 30
ambience_exterior = AMBIENCE_ALMAYER
ceiling_muffle = FALSE

/area/tortuga/hangar
name = "\improper USCSS Tortuga - Hangar"
icon_state = "almayer"
soundscape_playlist = SCAPE_PL_HANGAR
soundscape_interval = 50

/area/tortuga/cryo
name = "\improper USCSS Tortuga - Hyper-sleep Chamber"

/area/tortuga/corridor_upper
name = "\improper USCSS Tortuga - Habitat Deck Hall"

/area/tortuga/shower
name = "\improper USCSS Tortuga - Shower"

/area/tortuga/barrack
name = "\improper USCSS Tortuga - Barrack"

/area/tortuga/jokey_office
name = "\improper USCSS Tortuga - Jokey Office"

/area/tortuga/canteen
name = "\improper USCSS Tortuga - Dining Hall"

/area/tortuga/bridge
name = "\improper USCSS Tortuga - Bridge"

/area/tortuga/corridor_lower
name = "\improper USCSS Tortuga - Work Deck"

/area/tortuga/lift
name = "\improper USCSS Tortuga - Cargo Lift"

/area/tortuga/medical
name = "\improper USCSS Tortuga - Medbay"
973 changes: 973 additions & 0 deletions maps/map_files/USCSS_Tortuga/uscss_tortuga.dmm

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions maps/map_files/golden_arrow_RU/golden_arrow_RU.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@
"th" = (/obj/effect/decal/warning_stripes{icon_state = "W"; layer = 3.3},/obj/effect/decal/warning_stripes{icon_state = "E"; pixel_x = 1},/obj/effect/decal/cleanable/dirt,/obj/structure/pipes/standard/simple/hidden/supply,/turf/open/floor/almayer,/area/golden_arrow/hangar)
"tl" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/almayer,/area/golden_arrow/platoon_commander_rooms)
"tn" = (/obj/structure/shuttle/part/dropship1/transparent/middle_left_wing{name = "\improper Tripoli"},/turf/open/floor/plating,/area/golden_arrow/hangar)
"tp" = (/obj/structure/machinery/door/airlock/almayer/secure{dir = 1; name = "\improper Assembly Room"; req_access = list(); req_one_access_txt = "19;12"},/obj/structure/cable{icon_state = "1-2"},/obj/structure/pipes/standard/simple/hidden/supply,/obj/structure/machinery/door/firedoor/border_only/almayer{dir = 2},/obj/structure/disposalpipe/segment,/turf/open/floor/almayer{icon_state = "test_floor4"},/area/golden_arrow/briefing)
"tp" = (/obj/structure/machinery/door/airlock/almayer/secure{dir = 1; name = "\improper Assembly Room"; req_access = list(); req_one_access_txt = null},/obj/structure/cable{icon_state = "1-2"},/obj/structure/pipes/standard/simple/hidden/supply,/obj/structure/machinery/door/firedoor/border_only/almayer{dir = 2},/obj/structure/disposalpipe/segment,/turf/open/floor/almayer{icon_state = "test_floor4"},/area/golden_arrow/briefing)
"tr" = (/obj/structure/machinery/camera/autoname/golden_arrow{dir = 4; name = "ship-grade camera"},/obj/structure/sign/safety/storage{pixel_x = -18; pixel_y = -7},/obj/structure/sign/safety/two{pixel_x = -18; pixel_y = 7},/turf/open/floor/almayer,/area/golden_arrow/platoonprep)
"ts" = (/obj/structure/machinery/light,/obj/effect/decal/cleanable/dirt,/turf/open/floor/almayer{icon_state = "plate"},/area/golden_arrow/hangar)
"tt" = (/obj/effect/decal/warning_stripes{icon_state = "N"; pixel_y = 1},/obj/effect/decal/cleanable/dirt,/obj/structure/pipes/standard/simple/hidden/supply{dir = 8},/turf/open/floor/almayer,/area/golden_arrow/hangar)
Expand All @@ -536,7 +536,7 @@
"tL" = (/obj/structure/machinery/alarm/almayer{dir = 1},/obj/structure/prop/invuln/lattice_prop{icon_state = "lattice3"; pixel_x = 16; pixel_y = -15},/obj/structure/prop/invuln/lattice_prop{icon_state = "lattice2"; pixel_x = 16; pixel_y = 16},/obj/structure/pipes/vents/scrubber{dir = 8},/obj/structure/machinery/disposal{density = 0; layer = 3.2; pixel_y = 16},/obj/structure/disposalpipe/trunk{dir = 8},/turf/open/floor/almayer,/area/golden_arrow/dorms)
"tM" = (/obj/structure/machinery/light{dir = 4},/turf/open/floor/almayer,/area/space)
"tO" = (/obj/effect/decal/cleanable/dirt,/obj/structure/machinery/cm_vending/sorted/tech/comp_storage{density = 0; pixel_y = 19},/turf/open/floor/almayer,/area/golden_arrow/engineering)
"tP" = (/obj/structure/surface/table/almayer,/obj/item/storage/box/co2_knife{pixel_x = 3; pixel_y = 13},/obj/item/ammo_box/magazine/misc/flares/empty{pixel_x = -14; pixel_y = 16},/obj/item/storage/box/pdt_kit/advanced,/obj/structure/machinery/alarm/almayer{dir = 1},/turf/open/floor/almayer,/area/golden_arrow/platoonprep)
"tP" = (/obj/structure/surface/table/almayer,/obj/item/storage/box/co2_knife{pixel_x = 3; pixel_y = 13},/obj/item/ammo_box/magazine/misc/flares/empty{pixel_x = -14; pixel_y = 16},/obj/item/storage/box/pdt_kit/advanced,/obj/structure/machinery/alarm/almayer{dir = 1},/obj/item/cell/crap{charge = 1000; maxcharge = 1000; name = "\improper NVG mini-battery"; pixel_x = -18; pixel_y = -2},/turf/open/floor/almayer,/area/golden_arrow/platoonprep)
"tS" = (/obj/effect/decal/warning_stripes{icon_state = "S"},/obj/effect/decal/warning_stripes{icon_state = "NW-out"; pixel_y = 1},/turf/open/floor/almayer,/area/golden_arrow/hangar)
"tT" = (/obj/structure/machinery/light{dir = 1},/obj/effect/decal/cleanable/dirt,/obj/structure/largecrate/random/secure,/obj/item/reagent_container/food/drinks/cans/waterbottle{pixel_x = 7; pixel_y = 13},/turf/open/floor/almayer,/area/golden_arrow/hangar)
"tU" = (/obj/structure/pipes/standard/simple/hidden/supply{dir = 8},/obj/structure/machinery/door/poddoor/almayer{dir = 4; name = "\improper Storage Bay Blast Door"},/turf/open/floor/almayer{icon_state = "test_floor4"},/area/golden_arrow/hangar)
Expand Down Expand Up @@ -802,14 +802,14 @@
"Ef" = (/turf/open/floor/almayer{icon_state = "cargo"},/area/golden_arrow/hangar)
"Eg" = (/obj/item/device/radio/intercom{freerange = 1; name = "General Listening Channel"; pixel_y = 28},/turf/open/floor/almayer{dir = 8; icon_state = "cargo_arrow"},/area/golden_arrow/hangar)
"Eh" = (/obj/structure/surface/table/reinforced/prison,/obj/structure/machinery/recharger{pixel_x = -8; pixel_y = 3},/turf/open/floor/almayer{icon_state = "dark_sterile"},/area/golden_arrow/medical)
"Ej" = (/obj/effect/decal/cleanable/dirt,/obj/structure/surface/table/almayer,/obj/item/ammo_box/magazine/mk1{layer = 3.1; pixel_x = 3; pixel_y = 13},/obj/item/facepaint/sunscreen_stick{layer = 3.2; pixel_x = -2; pixel_y = 2},/obj/structure/sign/poster{desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; icon_state = "poster11"; name = "YOU ALWAYS KNOW A WORKING JOE."; pixel_x = 24; serial_number = 11},/turf/open/floor/almayer{icon_state = "plate"},/area/golden_arrow/platoonprep)
"Ej" = (/obj/effect/decal/cleanable/dirt,/obj/structure/surface/table/almayer,/obj/item/ammo_box/magazine/mk1{layer = 3.1; pixel_x = 3; pixel_y = 13},/obj/item/facepaint/sunscreen_stick{layer = 3.2; pixel_x = -2; pixel_y = 2},/obj/structure/sign/poster{desc = "YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE. YOU ALWAYS KNOW A WORKING JOE."; icon_state = "poster11"; name = "YOU ALWAYS KNOW A WORKING JOE."; pixel_x = 24; serial_number = 11},/obj/item/cell/crap{charge = 1000; maxcharge = 1000; name = "\improper NVG mini-battery"; pixel_x = -12},/obj/item/cell/crap{charge = 1000; maxcharge = 1000; name = "\improper NVG mini-battery"; pixel_x = -12; pixel_y = -5},/turf/open/floor/almayer{icon_state = "plate"},/area/golden_arrow/platoonprep)
"Ek" = (/obj/structure/pipes/standard/simple/hidden/supply,/obj/structure/cable/heavyduty{icon_state = "4-8"},/turf/open/floor/plating/plating_catwalk,/area/golden_arrow/hangar)
"Em" = (/obj/structure/pipes/standard/manifold/hidden/supply,/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment,/turf/open/floor/almayer,/area/golden_arrow/cryo_cells)
"En" = (/obj/effect/decal/cleanable/dirt,/obj/structure/machinery/power/apc/almayer{dir = 1},/obj/structure/cable{icon_state = "0-2"},/obj/structure/closet/crate/trashcart{pixel_y = 11},/obj/item/prop/colony/usedbandage,/obj/item/prop/colony/usedbandage{dir = 4},/obj/item/prop/colony/usedbandage{dir = 6; pixel_y = 6},/obj/item/prop/colony/usedbandage{dir = 10; pixel_y = 13},/obj/item/storage/pill_bottle,/turf/open/floor/almayer{icon_state = "dark_sterile"},/area/golden_arrow/medical)
"Ep" = (/obj/effect/decal/siding{icon_state = "siding10"},/turf/open/floor/plating,/area/golden_arrow/hangar)
"Ez" = (/obj/effect/decal/cleanable/dirt,/obj/structure/pipes/standard/simple/hidden/supply{dir = 8},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/almayer{dir = 4; icon_state = "cargo_arrow"},/area/golden_arrow/cryo_cells)
"EA" = (/obj/structure/pipes/standard/simple/hidden/supply{dir = 8},/turf/open/floor/almayer{dir = 4; icon_state = "cargo_arrow"},/area/golden_arrow/hangar)
"ED" = (/obj/docking_port/stationary/marine_dropship/golden_arrow_hangar_ru,/turf/open/floor/plating,/area/golden_arrow/hangar)
"ED" = (/obj/docking_port/stationary/marine_dropship/golden_arrow_hangar,/turf/open/floor/plating,/area/golden_arrow/hangar)
"EE" = (/obj/effect/decal/warning_stripes{icon_state = "W"},/obj/effect/decal/cleanable/liquid_fuel,/turf/open/floor/almayer,/area/golden_arrow/hangar)
"EG" = (/turf/open/space/basic,/area/space)
"EH" = (/obj/structure/machinery/camera/autoname/golden_arrow{dir = 8},/turf/open/floor/almayer{icon_state = "plate"},/area/golden_arrow/hangar)
Expand Down Expand Up @@ -1073,7 +1073,7 @@
"NR" = (/obj/structure/largecrate/supply/weapons/m56d{pixel_x = 9; pixel_y = 10},/obj/structure/largecrate/supply/weapons/m56d{pixel_x = 9; pixel_y = 25},/obj/effect/decal/warning_stripes{icon_state = "E"; pixel_x = 1},/obj/effect/decal/warning_stripes{icon_state = "W"},/turf/open/floor/almayer{icon_state = "plate"},/area/golden_arrow/hangar)
"NU" = (/obj/effect/decal/cleanable/dirt,/obj/structure/sign/safety/ammunition{pixel_x = -18},/obj/structure/machinery/door/poddoor/shutters/almayer{id = "weapons_conny"; name = "\improper Squad One Weapons Locker"; pixel_y = -4},/turf/open/floor/almayer{icon_state = "test_floor4"},/area/golden_arrow/platoonarmory)
"NW" = (/obj/structure/machinery/light{dir = 1},/turf/open/floor/almayer{icon_state = "plate"},/area/golden_arrow/hangar)
"NX" = (/obj/effect/decal/cleanable/dirt,/obj/structure/surface/table/almayer,/obj/structure/barricade/handrail{dir = 4},/obj/item/storage/toolbox/mechanical{pixel_x = -11; pixel_y = 14},/obj/item/tool/hand_labeler{pixel_x = -3; pixel_y = 2},/obj/item/spacecash/c10{layer = 2.7; pixel_x = 11; pixel_y = 2},/obj/item/device/encryptionkey/sentry_laptop{pixel_x = 7; pixel_y = 14},/obj/item/device/encryptionkey/sentry_laptop{pixel_x = 7; pixel_y = 6},/turf/open/floor/almayer,/area/golden_arrow/platoonprep)
"NX" = (/obj/effect/decal/cleanable/dirt,/obj/structure/surface/table/almayer,/obj/structure/barricade/handrail{dir = 4},/obj/item/storage/toolbox/mechanical{pixel_x = -11; pixel_y = 14},/obj/item/tool/hand_labeler{pixel_x = -3; pixel_y = 2},/obj/item/spacecash/c10{layer = 2.7; pixel_x = 11; pixel_y = 2},/obj/item/device/encryptionkey/sentry_laptop{pixel_x = 7; pixel_y = 14},/obj/item/device/encryptionkey/sentry_laptop{pixel_x = 7; pixel_y = 6},/obj/item/cell/crap{charge = 1000; maxcharge = 1000; name = "\improper NVG mini-battery"; pixel_x = 4; pixel_y = -4},/turf/open/floor/almayer,/area/golden_arrow/platoonprep)
"NZ" = (/obj/structure/prop/invuln/lattice_prop{icon_state = "lattice1"; pixel_x = 16; pixel_y = -15},/turf/open/floor/almayer,/area/golden_arrow/dorms)
"Oa" = (/obj/effect/decal/warning_stripes{icon_state = "W"; layer = 3.3; pixel_x = -1},/obj/effect/decal/cleanable/dirt,/obj/structure/cable/heavyduty{icon_state = "1-8"},/turf/open/floor/almayer,/area/golden_arrow/hangar)
"Ob" = (/obj/effect/decal/warning_stripes{icon_state = "W"},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/almayer,/area/golden_arrow/hangar)
Expand Down Expand Up @@ -1246,7 +1246,7 @@
"TU" = (/obj/structure/machinery/light{dir = 8},/turf/open/floor/plating/plating_catwalk,/area/golden_arrow/hangar)
"TW" = (/obj/structure/platform{dir = 1},/obj/structure/cable{icon_state = "2-8"},/obj/effect/decal/warning_stripes{icon_state = "S"},/turf/open/floor/almayer{icon_state = "plate"},/area/golden_arrow/briefing)
"TY" = (/obj/structure/sign/banners/united_americas_flag{pixel_x = -16; pixel_y = 30},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/almayer,/area/golden_arrow/briefing)
"TZ" = (/obj/effect/decal/cleanable/dirt,/obj/structure/surface/table/almayer,/obj/item/storage/fancy/cigarettes/lucky_strikes_4{pixel_x = 7; pixel_y = 7},/obj/item/storage/fancy/cigar/matchbook{pixel_x = -1; pixel_y = 6},/turf/open/floor/almayer{icon_state = "plate"},/area/golden_arrow/platoonprep)
"TZ" = (/obj/effect/decal/cleanable/dirt,/obj/structure/surface/table/almayer,/obj/item/storage/fancy/cigarettes/lucky_strikes_4{pixel_x = 7; pixel_y = 7},/obj/item/storage/fancy/cigar/matchbook{pixel_x = -1; pixel_y = 6},/obj/item/cell/crap{charge = 1000; maxcharge = 1000; name = "\improper NVG mini-battery"; pixel_x = 2; pixel_y = -4},/turf/open/floor/almayer{icon_state = "plate"},/area/golden_arrow/platoonprep)
"Ua" = (/obj/structure/pipes/vents/pump,/obj/structure/machinery/door/poddoor/shutters/almayer{id = "weapons_conny"; name = "\improper Squad Two Weapons Locker"; pixel_y = -4},/turf/open/floor/almayer{icon_state = "test_floor4"},/area/golden_arrow/platoonarmory)
"Uc" = (/obj/structure/bed/chair/comfy{buckling_y = 2; dir = 8; pixel_y = 2},/turf/open/floor/almayer,/area/golden_arrow/cryo_cells)
"Uf" = (/obj/effect/decal/cleanable/dirt,/obj/structure/machinery/door/poddoor/shutters/almayer{dir = 4; id = "squadarmory"; name = "\improper Gear Lockers"},/turf/open/floor/almayer{icon_state = "test_floor4"},/area/golden_arrow/platoonprep)
Expand Down Expand Up @@ -1284,7 +1284,7 @@
"Vj" = (/obj/item/device/flashlight/lamp/tripod/grey,/turf/open/floor/almayer{icon_state = "plate"},/area/golden_arrow/hangar)
"Vn" = (/obj/structure/surface/table/almayer,/obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{layer = 3.1; name = "Midway Remote Control Console"; pixel_y = 6; shuttleId = "dropship_midway"},/turf/open/floor/almayer,/area/golden_arrow/hangar)
"Vo" = (/obj/effect/decal/warning_stripes{icon_state = "NE-out"; pixel_x = 1; pixel_y = 1},/obj/effect/decal/warning_stripes{icon_state = "NW-out"; pixel_y = 1},/obj/effect/decal/cleanable/dirt,/obj/structure/pipes/vents/pump,/turf/open/floor/almayer{icon_state = "plate"},/area/golden_arrow/hangar)
"Vs" = (/obj/structure/surface/table/almayer,/obj/structure/barricade/handrail{dir = 8},/obj/item/tool/hand_labeler{pixel_x = 1; pixel_y = 13},/obj/item/device/flashlight/flare{pixel_x = 19; pixel_y = -1},/obj/structure/machinery/door_control/brbutton{id = "squadarmory"; name = "gear locker shutter control"; pixel_y = 28; req_one_access_txt = "19;12"},/turf/open/floor/almayer,/area/golden_arrow/platoonprep)
"Vs" = (/obj/structure/surface/table/almayer,/obj/structure/barricade/handrail{dir = 8},/obj/item/tool/hand_labeler{pixel_x = 1; pixel_y = 13},/obj/item/device/flashlight/flare{pixel_x = 19; pixel_y = 2},/obj/structure/machinery/door_control/brbutton{id = "squadarmory"; name = "gear locker shutter control"; pixel_y = 28; req_one_access_txt = "19;12"},/obj/item/cell/crap{charge = 1000; maxcharge = 1000; name = "\improper NVG mini-battery"; pixel_x = -8; pixel_y = 4},/obj/item/cell/crap{charge = 1000; maxcharge = 1000; name = "\improper NVG mini-battery"; pixel_x = -7; pixel_y = -3},/obj/item/cell/crap{charge = 1000; maxcharge = 1000; name = "\improper NVG mini-battery"; pixel_x = 3; pixel_y = -3},/turf/open/floor/almayer,/area/golden_arrow/platoonprep)
"Vu" = (/obj/structure/surface/table/almayer,/obj/item/storage/bible{desc = "As the legendary US Army chaplain once said, 'There are no Athiests in fancy offices'."; name = "Holy Bible"; pixel_x = -5; pixel_y = 4},/obj/item/device/flashlight/lamp/on{pixel_x = 5; pixel_y = 14},/obj/item/ashtray/plastic{icon_state = "ashtray_full_bl"; pixel_x = 9; pixel_y = 2},/obj/item/trash/cigbutt{pixel_x = 1; pixel_y = 10; randpixel = 0},/turf/open/floor/almayer,/area/golden_arrow/shared_office)
"Vv" = (/obj/effect/decal/cleanable/dirt,/obj/item/reagent_container/glass/bucket/janibucket{pixel_x = -7; pixel_y = 15},/turf/open/floor/almayer,/area/golden_arrow/engineering)
"Vw" = (/obj/structure/shuttle/part/dropship1/transparent/nose_top_right{name = "\improper Tripoli"},/turf/open/floor/plating,/area/golden_arrow/hangar)
Expand Down
Loading

0 comments on commit f4cee59

Please sign in to comment.