Merge pull request #5278 from Novacat/nova-heterochromia

New Modular Computer Sprites

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"

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]!")

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

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)
 	},

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)

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"