cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution Four

Browse Source
This commit is contained in:
Unknown
2019-04-28 22:37:49 -04:00
parent 7b9c155511
commit 1b7bab5810
6 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/modules/modular_computers/computers/subtypes/preset_laptop.dm
View File

@@ -30,3 +30,16 @@
card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
battery_module = new/obj/item/weapon/computer_hardware/battery_module/advanced(src)
battery_module.charge_to_full()
//VOREstation Add Begin
/obj/item/modular_computer/laptop/preset/custom_loadout/elite/install_default_hardware()
..()
processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src)
tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/super(src)
network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src)
nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
battery_module = new/obj/item/weapon/computer_hardware/battery_module/super(src)
battery_module.charge_to_full()
//VOREstation Add End

1
maps/submaps/shelters/shelter_3.dmm
View File

@@ -52,6 +52,7 @@
/obj/item/weapon/storage/pill_bottle/antitox,
/obj/item/weapon/storage/firstaid/adv,
/obj/item/weapon/storage/firstaid/regular,
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
/obj/item/weapon/storage/box/survival/comp{
starts_with = list(/obj/item/weapon/tool/prybar/red,/obj/item/clothing/glasses/goggles,/obj/item/weapon/reagent_containers/hypospray/autoinjector,/obj/item/stack/medical/bruise_pack,/obj/item/device/flashlight/glowstick,/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/emergency/oxygen/engi)
},

2
maps/tether/submaps/aerostat/submaps/Rockybase.dmm
View File

@@ -137,7 +137,7 @@
/area/submap/virgo2/Rockybase)
"aA" = (
/obj/structure/table/standard,
/obj/item/device/laptop,
/obj/item/modular_computer/laptop/preset/custom_loadout/advanced,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/submap/virgo2/Rockybase)
"aB" = (

22
maps/tether/submaps/tether_misc.dmm
View File

@@ -1,83 +1,83 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/turf/space,
/obj/structure/shuttle/engine/propulsion{
icon_state = "burst_l"
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry{
dir = 1
},
/area/supply/dock)
"ab" = (
/turf/space,
/obj/structure/shuttle/engine/propulsion,
/turf/space,
/turf/simulated/shuttle/plating/airless/carry{
dir = 1
},
/area/supply/dock)
"ac" = (
/turf/space,
/obj/structure/shuttle/engine/propulsion{
icon_state = "burst_r"
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry{
dir = 1
},
/area/supply/dock)
"ad" = (
/turf/space,
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_r";
dir = 4
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/trade/centcom)
"ae" = (
/turf/space,
/obj/structure/shuttle/engine/propulsion{
dir = 4
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/trade/centcom)
"af" = (
/turf/space,
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_l";
dir = 4
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/trade/centcom)
"ag" = (
/turf/space,
/obj/machinery/power/emitter/gyrotron/anchored{
desc = "It is a heavy duty pulse laser emitter.";
dir = 8;
icon_state = "emitter-off";
name = "pulse laser"
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/syndicate_station/start)
"ah" = (
/turf/space,
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_r";
dir = 4
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/syndicate_station/start)
"ai" = (
/turf/space,
/obj/structure/shuttle/engine/propulsion{
dir = 4
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/syndicate_station/start)
"aj" = (
/turf/space,
/obj/structure/shuttle/engine/propulsion{
icon_state = "propulsion_l";
dir = 4
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/syndicate_station/start)
"ak" = (
@@ -5000,7 +5000,7 @@
/area/shuttle/trade/centcom)
"lW" = (
/obj/structure/table/woodentable,
/obj/item/device/laptop,
/obj/item/modular_computer/laptop/preset/custom_loadout/standard,
/turf/simulated/floor/carpet,
/area/shuttle/trade/centcom)
"lX" = (

2
maps/tether/submaps/tether_ships.dmm
View File

@@ -1575,7 +1575,7 @@
/area/houseboat)
"ec" = (
/obj/structure/table/woodentable,
/obj/item/device/laptop,
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
/turf/simulated/floor/wood,
/area/houseboat)
"ed" = (

11
maps/tether/tether-02-surface2.dmm
View File

@@ -19140,6 +19140,15 @@
},
/turf/simulated/open,
/area/engineering/atmos)
"ZR" = (
/obj/machinery/ntnet_relay,
/turf/simulated/floor/bluegrid{
name = "Mainframe Base";
nitrogen = 100;
oxygen = 0;
temperature = 80
},
/area/tcommsat/chamber)
"ZT" = (
/obj/structure/closet/crate/bin{
anchored = 1;
@@ -33626,7 +33635,7 @@ GP
HR
Hd
Hn
Gz
ZR
Hy
HD
HK