diff --git a/code/modules/modular_computers/computers/subtypes/dev_console.dm b/code/modules/modular_computers/computers/subtypes/dev_console.dm index 4a8981d41b0..d7f977f33bc 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_console.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_console.dm @@ -1,7 +1,7 @@ /obj/item/modular_computer/console name = "console" desc = "A stationary computer." - icon = 'icons/obj/modular_console.dmi' + icon = 'icons/obj/modular_console_vr.dmi' //VOREStation Edit icon_state = "console" icon_state_unpowered = "console" icon_state_screensaver = "standby" diff --git a/code/modules/modular_computers/computers/subtypes/dev_laptop.dm b/code/modules/modular_computers/computers/subtypes/dev_laptop.dm index 851008b23d5..3a9cab6bc24 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_laptop.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_laptop.dm @@ -28,8 +28,6 @@ //VOREStation Addition Begin var/supported = FALSE for(var/obj/structure/table/S in loc) - if(istype(S, /obj/structure/table/bench) || istype(S, /obj/structure/table/rack)) - continue supported = TRUE if(!supported) to_chat(usr, "You will need a better supporting surface before opening \the [src]!") diff --git a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm index 3152878fc2d..905df245901 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_laptop.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_laptop.dm @@ -31,6 +31,11 @@ battery_module = new/obj/item/weapon/computer_hardware/battery_module/advanced(src) battery_module.charge_to_full() +/obj/item/modular_computer/laptop/preset/custom_loadout/elite + icon_state_unpowered = "adv-laptop-open" + icon_state = "adv-laptop-open" + icon_state_closed = "adv-laptop-closed" + /obj/item/modular_computer/laptop/preset/custom_loadout/elite/install_default_hardware() ..() processor_unit = new/obj/item/weapon/computer_hardware/processor_unit(src) @@ -41,3 +46,23 @@ 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 Start +/obj/item/modular_computer/laptop/preset/custom_loadout/rugged + name = "rugged laptop computer" + desc = "A rugged portable computer." + icon = 'icons/obj/modular_laptop_vr.dmi' + max_damage = 300 + broken_damage = 200 + +/obj/item/modular_computer/laptop/preset/custom_loadout/rugged/install_default_hardware() + ..() + processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src) + tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src) + hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/advanced(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 \ No newline at end of file diff --git a/icons/obj/modular_console_vr.dmi b/icons/obj/modular_console_vr.dmi new file mode 100644 index 00000000000..125711410dc Binary files /dev/null and b/icons/obj/modular_console_vr.dmi differ diff --git a/icons/obj/modular_laptop.dmi b/icons/obj/modular_laptop.dmi index af1883055e0..8f060dd5001 100644 Binary files a/icons/obj/modular_laptop.dmi and b/icons/obj/modular_laptop.dmi differ diff --git a/icons/obj/modular_laptop_vr.dmi b/icons/obj/modular_laptop_vr.dmi new file mode 100644 index 00000000000..6dc2af2d017 Binary files /dev/null and b/icons/obj/modular_laptop_vr.dmi differ diff --git a/maps/submaps/shelters/shelter_3.dmm b/maps/submaps/shelters/shelter_3.dmm index 42321a3d263..c288aa97023 100644 --- a/maps/submaps/shelters/shelter_3.dmm +++ b/maps/submaps/shelters/shelter_3.dmm @@ -52,7 +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/modular_computer/laptop/preset/custom_loadout/rugged, /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) }, diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 8e5d0ca44e6..fa40d5e3b72 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -3958,6 +3958,9 @@ /obj/item/device/radio/intercom/department/medbay{ pixel_y = -24 }, +/obj/effect/landmark/start{ + name = "Paramedic" + }, /turf/simulated/floor/tiled/dark, /area/medical/medbay_emt_bay) "fP" = ( @@ -18063,6 +18066,9 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 6 }, +/obj/effect/landmark/start{ + name = "Paramedic" + }, /turf/simulated/floor/tiled/dark, /area/medical/medbay_emt_bay) "Bx" = ( @@ -18278,7 +18284,7 @@ dir = 8 }, /obj/effect/landmark/start{ - name = "Pathfinder" + name = "Paramedic" }, /turf/simulated/floor/tiled/dark, /area/medical/medbay_emt_bay) @@ -18460,7 +18466,7 @@ dir = 4 }, /obj/effect/landmark/start{ - name = "Pathfinder" + name = "Paramedic" }, /turf/simulated/floor/tiled/dark, /area/medical/medbay_emt_bay) diff --git a/vorestation.dme b/vorestation.dme index 43f1593a20c..c5890a560a4 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2357,8 +2357,8 @@ #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\fox_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\parrot.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\diyaab.dm" -#include "code\modules\mob\living\simple_mob\subtypes\animal\sif\fluffy_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\duck.dm" +#include "code\modules\mob\living\simple_mob\subtypes\animal\sif\fluffy_vr.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\frostfly.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\glitterfly.dm" #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\hooligan_crab.dm"