mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 05:38:15 +01:00
Update shelter_6.dmm
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
},
|
||||
/area/shuttle/tabiranth)
|
||||
"ab" = (
|
||||
/obj/machinery/pointdefense{
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "tabiranth_pd"
|
||||
},
|
||||
/turf/simulated/floor/reinforced/airless{
|
||||
@@ -1134,457 +1134,12 @@
|
||||
pixel_x = 2;
|
||||
pixel_y = 2
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
/obj/item/stack/telecrystal{
|
||||
amount = 240
|
||||
},
|
||||
/obj/item/stack/telecrystal{
|
||||
amount = 240
|
||||
},
|
||||
/obj/item/stack/telecrystal{
|
||||
amount = 240
|
||||
},
|
||||
/obj/item/stack/telecrystal{
|
||||
amount = 240
|
||||
},
|
||||
/obj/item/stack/telecrystal{
|
||||
amount = 240
|
||||
},
|
||||
/obj/item/stack/telecrystal{
|
||||
amount = 240
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card{
|
||||
mine_points = 50000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card{
|
||||
mine_points = 50000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card{
|
||||
mine_points = 50000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card{
|
||||
mine_points = 50000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card{
|
||||
mine_points = 50000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card{
|
||||
mine_points = 50000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card/survey{
|
||||
name = "survey point card";
|
||||
survey_points = 5000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card/survey{
|
||||
name = "survey point card";
|
||||
survey_points = 5000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card/survey{
|
||||
name = "survey point card";
|
||||
survey_points = 5000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card/survey{
|
||||
name = "survey point card";
|
||||
survey_points = 5000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card/survey{
|
||||
name = "survey point card";
|
||||
survey_points = 5000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card/survey{
|
||||
name = "survey point card";
|
||||
survey_points = 5000
|
||||
},
|
||||
/obj/item/device/survivalcapsule/military,
|
||||
/obj/item/device/survivalcapsule/military,
|
||||
/obj/item/device/survivalcapsule/escapepod,
|
||||
/obj/item/weapon/technomancer_catalog/universal,
|
||||
/obj/item/weapon/technomancer_core/universal,
|
||||
/obj/item/weapon/storage/secure/briefcase/money{
|
||||
desc = "An sleek tidy briefcase.";
|
||||
name = "secure briefcase"
|
||||
},
|
||||
/obj/item/weapon/storage/secure/briefcase/money{
|
||||
desc = "An sleek tidy briefcase.";
|
||||
name = "secure briefcase"
|
||||
},
|
||||
/obj/item/weapon/storage/secure/briefcase/money{
|
||||
desc = "An sleek tidy briefcase.";
|
||||
name = "secure briefcase"
|
||||
},
|
||||
/obj/item/weapon/storage/secure/briefcase/money{
|
||||
desc = "An sleek tidy briefcase.";
|
||||
name = "secure briefcase"
|
||||
},
|
||||
/obj/item/weapon/storage/secure/briefcase/money{
|
||||
desc = "An sleek tidy briefcase.";
|
||||
name = "secure briefcase"
|
||||
},
|
||||
/obj/item/weapon/storage/secure/briefcase/money{
|
||||
desc = "An sleek tidy briefcase.";
|
||||
name = "secure briefcase"
|
||||
},
|
||||
/obj/item/device/radio/uplink,
|
||||
/obj/item/device/radio/uplink,
|
||||
/obj/item/device/spaceflare,
|
||||
/obj/item/device/spaceflare,
|
||||
/obj/item/device/perfect_tele/frontier/unknown/six,
|
||||
/obj/item/device/healthanalyzer/phasic,
|
||||
/obj/item/device/bluespaceradio/tether_prelinked,
|
||||
/obj/item/weapon/cat_box,
|
||||
/obj/item/weapon/cat_box,
|
||||
/obj/item/weapon/cat_box/black,
|
||||
/obj/item/weapon/cat_box/black,
|
||||
/obj/item/weapon/disposable_teleporter,
|
||||
/obj/item/weapon/hand_tele,
|
||||
/obj/item/weapon/storage/belt,
|
||||
/obj/item/weapon/storage/belt/medical/alien,
|
||||
/obj/item/weapon/storage/belt/utility/alien,
|
||||
/obj/item/weapon/storage/belt/holding,
|
||||
/obj/item/weapon/rig/ert/assetprotection,
|
||||
/obj/item/weapon/rig/ert/assetprotection,
|
||||
/obj/item/weapon/gun/energy/pulse_rifle,
|
||||
/obj/item/weapon/gun/energy/pulse_rifle,
|
||||
/obj/item/weapon/gun/energy/pulse_rifle,
|
||||
/obj/item/weapon/gun/energy/pulse_rifle,
|
||||
/obj/item/weapon/gun/projectile/automatic/l6_saw,
|
||||
/obj/item/weapon/gun/projectile/automatic/l6_saw,
|
||||
/obj/item/ammo_magazine/m545saw,
|
||||
/obj/item/ammo_magazine/m545saw,
|
||||
/obj/item/ammo_magazine/m545saw,
|
||||
/obj/item/ammo_magazine/m545saw,
|
||||
/obj/item/ammo_magazine/m545saw/ap,
|
||||
/obj/item/ammo_magazine/m545saw/ap,
|
||||
/obj/item/ammo_magazine/m545saw/ap,
|
||||
/obj/item/ammo_magazine/m545saw/ap,
|
||||
/obj/item/ammo_magazine/m545saw/ap,
|
||||
/obj/item/ammo_magazine/m545saw/ap,
|
||||
/obj/item/weapon/gun/projectile/automatic/z8,
|
||||
/obj/item/weapon/gun/projectile/automatic/z8,
|
||||
/obj/item/weapon/gun/projectile/heavysniper,
|
||||
/obj/item/weapon/storage/box/sniperammo,
|
||||
/obj/item/weapon/storage/box/sniperammo,
|
||||
/obj/item/ammo_magazine/m762,
|
||||
/obj/item/ammo_magazine/m762,
|
||||
/obj/item/ammo_magazine/m762,
|
||||
/obj/item/ammo_magazine/m762,
|
||||
/obj/item/ammo_magazine/m762/ap,
|
||||
/obj/item/ammo_magazine/m762/ap,
|
||||
/obj/item/ammo_magazine/m762/ap,
|
||||
/obj/item/ammo_magazine/m762/ap,
|
||||
/obj/item/ammo_magazine/m762/ap,
|
||||
/obj/item/ammo_magazine/m762/ap,
|
||||
/obj/item/weapon/storage/box/sniperammo,
|
||||
/obj/item/weapon/storage/box/sniperammo,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/hybrid,
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/hybrid,
|
||||
/obj/item/device/perfect_tele/alien,
|
||||
/obj/item/device/perfect_tele/frontier/staff,
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 9
|
||||
},
|
||||
/obj/item/weapon/inducer/hybrid,
|
||||
/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid,
|
||||
/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid,
|
||||
/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid,
|
||||
/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid,
|
||||
/obj/item/weapon/circuitboard/machine/abductor/core/hybrid,
|
||||
/obj/item/weapon/circuitboard/machine/abductor/core/hybrid,
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/tabiranth)
|
||||
"bk" = (
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 5
|
||||
},
|
||||
/obj/structure/closet/secure_closet/wall{
|
||||
anchored = 1;
|
||||
density = 0;
|
||||
pixel_x = 32;
|
||||
req_access = list(101)
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor/grid,
|
||||
/area/shuttle/tabiranth)
|
||||
"bl" = (
|
||||
/obj/machinery/power/smes/buildable/hybrid{
|
||||
input_level = 200000;
|
||||
output_level = 200000
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/tabiranth)
|
||||
"bm" = (
|
||||
/obj/structure/cable/cyan{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/machinery/power/terminal{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/tabiranth)
|
||||
"bn" = (
|
||||
/obj/machinery/pointdefense_control{
|
||||
id_tag = "tabiranth_pd"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/tabiranth)
|
||||
"bo" = (
|
||||
/obj/structure/closet/medical_wall{
|
||||
pixel_x = -32
|
||||
},
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/storage/box/gloves,
|
||||
/obj/item/weapon/storage/firstaid/surgery,
|
||||
/obj/item/weapon/reagent_containers/spray/cleaner{
|
||||
desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
|
||||
name = "Surgery Cleaner";
|
||||
pixel_x = 2;
|
||||
pixel_y = 2
|
||||
},
|
||||
/obj/item/weapon/reagent_containers/spray/cleaner{
|
||||
desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
|
||||
name = "Surgery Cleaner";
|
||||
pixel_x = 2;
|
||||
pixel_y = 2
|
||||
||||||| parent of 7001747cc3... Merge pull request #10157 from Novacat/nova-ert
|
||||
/obj/item/stack/telecrystal{
|
||||
amount = 240
|
||||
},
|
||||
/obj/item/stack/telecrystal{
|
||||
amount = 240
|
||||
},
|
||||
/obj/item/stack/telecrystal{
|
||||
amount = 240
|
||||
},
|
||||
/obj/item/stack/telecrystal{
|
||||
amount = 240
|
||||
},
|
||||
/obj/item/stack/telecrystal{
|
||||
amount = 240
|
||||
},
|
||||
/obj/item/stack/telecrystal{
|
||||
amount = 240
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card{
|
||||
mine_points = 50000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card{
|
||||
mine_points = 50000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card{
|
||||
mine_points = 50000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card{
|
||||
mine_points = 50000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card{
|
||||
mine_points = 50000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card{
|
||||
mine_points = 50000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card/survey{
|
||||
name = "survey point card";
|
||||
survey_points = 5000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card/survey{
|
||||
name = "survey point card";
|
||||
survey_points = 5000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card/survey{
|
||||
name = "survey point card";
|
||||
survey_points = 5000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card/survey{
|
||||
name = "survey point card";
|
||||
survey_points = 5000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card/survey{
|
||||
name = "survey point card";
|
||||
survey_points = 5000
|
||||
},
|
||||
/obj/item/weapon/card/mining_point_card/survey{
|
||||
name = "survey point card";
|
||||
survey_points = 5000
|
||||
},
|
||||
/obj/item/device/survivalcapsule/military,
|
||||
/obj/item/device/survivalcapsule/military,
|
||||
/obj/item/device/survivalcapsule/escapepod,
|
||||
/obj/item/weapon/technomancer_catalog/universal,
|
||||
/obj/item/weapon/technomancer_core/universal,
|
||||
/obj/item/weapon/storage/secure/briefcase/money{
|
||||
desc = "An sleek tidy briefcase.";
|
||||
name = "secure briefcase"
|
||||
},
|
||||
/obj/item/weapon/storage/secure/briefcase/money{
|
||||
desc = "An sleek tidy briefcase.";
|
||||
name = "secure briefcase"
|
||||
},
|
||||
/obj/item/weapon/storage/secure/briefcase/money{
|
||||
desc = "An sleek tidy briefcase.";
|
||||
name = "secure briefcase"
|
||||
},
|
||||
/obj/item/weapon/storage/secure/briefcase/money{
|
||||
desc = "An sleek tidy briefcase.";
|
||||
name = "secure briefcase"
|
||||
},
|
||||
/obj/item/weapon/storage/secure/briefcase/money{
|
||||
desc = "An sleek tidy briefcase.";
|
||||
name = "secure briefcase"
|
||||
},
|
||||
/obj/item/weapon/storage/secure/briefcase/money{
|
||||
desc = "An sleek tidy briefcase.";
|
||||
name = "secure briefcase"
|
||||
},
|
||||
/obj/item/device/radio/uplink,
|
||||
/obj/item/device/radio/uplink,
|
||||
/obj/item/device/spaceflare,
|
||||
/obj/item/device/spaceflare,
|
||||
/obj/item/device/healthanalyzer/phasic,
|
||||
/obj/item/device/bluespaceradio/tether_prelinked,
|
||||
/obj/item/weapon/cat_box,
|
||||
/obj/item/weapon/cat_box,
|
||||
/obj/item/weapon/cat_box/black,
|
||||
/obj/item/weapon/cat_box/black,
|
||||
/obj/item/weapon/disposable_teleporter,
|
||||
/obj/item/weapon/hand_tele,
|
||||
/obj/item/weapon/storage/belt,
|
||||
/obj/item/weapon/storage/belt/medical/alien,
|
||||
/obj/item/weapon/storage/belt/utility/alien,
|
||||
/obj/item/weapon/storage/belt/holding,
|
||||
/obj/item/weapon/rig/ert/assetprotection,
|
||||
/obj/item/weapon/rig/ert/assetprotection,
|
||||
/obj/item/weapon/gun/energy/pulse_rifle,
|
||||
/obj/item/weapon/gun/energy/pulse_rifle,
|
||||
/obj/item/weapon/gun/energy/pulse_rifle,
|
||||
/obj/item/weapon/gun/energy/pulse_rifle,
|
||||
/obj/item/weapon/gun/projectile/automatic/l6_saw,
|
||||
/obj/item/weapon/gun/projectile/automatic/l6_saw,
|
||||
/obj/item/ammo_magazine/m545saw,
|
||||
/obj/item/ammo_magazine/m545saw,
|
||||
/obj/item/ammo_magazine/m545saw,
|
||||
/obj/item/ammo_magazine/m545saw,
|
||||
/obj/item/ammo_magazine/m545saw/ap,
|
||||
/obj/item/ammo_magazine/m545saw/ap,
|
||||
/obj/item/ammo_magazine/m545saw/ap,
|
||||
/obj/item/ammo_magazine/m545saw/ap,
|
||||
/obj/item/ammo_magazine/m545saw/ap,
|
||||
/obj/item/ammo_magazine/m545saw/ap,
|
||||
/obj/item/weapon/gun/projectile/automatic/z8,
|
||||
/obj/item/weapon/gun/projectile/automatic/z8,
|
||||
/obj/item/weapon/gun/projectile/heavysniper,
|
||||
/obj/item/weapon/storage/box/sniperammo,
|
||||
/obj/item/weapon/storage/box/sniperammo,
|
||||
/obj/item/ammo_magazine/m762,
|
||||
/obj/item/ammo_magazine/m762,
|
||||
/obj/item/ammo_magazine/m762,
|
||||
/obj/item/ammo_magazine/m762,
|
||||
/obj/item/ammo_magazine/m762/ap,
|
||||
/obj/item/ammo_magazine/m762/ap,
|
||||
/obj/item/ammo_magazine/m762/ap,
|
||||
/obj/item/ammo_magazine/m762/ap,
|
||||
/obj/item/ammo_magazine/m762/ap,
|
||||
/obj/item/ammo_magazine/m762/ap,
|
||||
/obj/item/weapon/storage/box/sniperammo,
|
||||
/obj/item/weapon/storage/box/sniperammo,
|
||||
/obj/item/modular_computer/laptop/preset/custom_loadout/hybrid,
|
||||
/obj/item/modular_computer/tablet/preset/custom_loadout/hybrid,
|
||||
/obj/item/device/perfect_tele/alien,
|
||||
/obj/item/device/perfect_tele/frontier/staff,
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 9
|
||||
},
|
||||
/obj/item/weapon/inducer/hybrid,
|
||||
/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid,
|
||||
/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid,
|
||||
/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid,
|
||||
/obj/item/weapon/cell/device/weapon/recharge/alien/hybrid,
|
||||
/obj/item/weapon/circuitboard/machine/abductor/core/hybrid,
|
||||
/obj/item/weapon/circuitboard/machine/abductor/core/hybrid,
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/tabiranth)
|
||||
"bk" = (
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 5
|
||||
},
|
||||
/obj/structure/closet/secure_closet/wall{
|
||||
anchored = 1;
|
||||
density = 0;
|
||||
pixel_x = 32;
|
||||
req_access = list(101)
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor/grid,
|
||||
/area/shuttle/tabiranth)
|
||||
"bl" = (
|
||||
/obj/machinery/power/smes/buildable/hybrid{
|
||||
input_level = 200000;
|
||||
output_level = 200000
|
||||
},
|
||||
/obj/structure/cable/cyan{
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/tabiranth)
|
||||
"bm" = (
|
||||
/obj/structure/cable/cyan{
|
||||
d1 = 1;
|
||||
d2 = 8;
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/machinery/power/terminal{
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/tabiranth)
|
||||
"bn" = (
|
||||
/obj/machinery/pointdefense_control{
|
||||
id_tag = "tabiranth_pd"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/tabiranth)
|
||||
"bo" = (
|
||||
/obj/structure/closet/medical_wall{
|
||||
pixel_x = -32
|
||||
},
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus,
|
||||
/obj/item/weapon/storage/box/gloves,
|
||||
/obj/item/weapon/storage/firstaid/surgery,
|
||||
/obj/item/weapon/reagent_containers/spray/cleaner{
|
||||
desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
|
||||
name = "Surgery Cleaner";
|
||||
pixel_x = 2;
|
||||
pixel_y = 2
|
||||
},
|
||||
/obj/item/weapon/reagent_containers/spray/cleaner{
|
||||
desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
|
||||
name = "Surgery Cleaner";
|
||||
pixel_x = 2;
|
||||
pixel_y = 2
|
||||
=======
|
||||
/obj/item/weapon/reagent_containers/spray/cleaner{
|
||||
desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back.";
|
||||
name = "Surgery Cleaner";
|
||||
pixel_x = 2;
|
||||
pixel_y = 2
|
||||
>>>>>>> 7001747cc3... Merge pull request #10157 from Novacat/nova-ert
|
||||
},
|
||||
/obj/item/device/mmi/digital/posibrain,
|
||||
/obj/item/device/mmi,
|
||||
/obj/item/weapon/book/manual/robotics_cyborgs,
|
||||
|
||||
Reference in New Issue
Block a user