Merge pull request cmss13-devs#60 from 800maximum123/wh40k

Wh40k

code/modules/organs/limb_objects.dm

@@ -121,7 +121,10 @@
 		var/datum/sprite_accessory/hair_style = GLOB.hair_styles_list[H.h_style]
 		if(hair_style)
 			var/icon/hair = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
-			var/icon/eyes = new/icon("icon" = 'icons/mob/humans/onmob/human_face.dmi', "icon_state" = H.species ? H.species.eyes : "eyes_s")
+// [PVE-RU-EDIT]
+//			var/icon/eyes = new/icon("icon" = 'icons/mob/humans/onmob/human_face.dmi', "icon_state" = H.species ? H.species.eyes : "eyes_s")
+			var/icon/eyes = new/icon("icon" = H.species.eye_icon_location, "icon_state" = H.species ? H.species.eyes : "eyes_s")
+// [/PVE-RU-EDIT]
 			if(hair_style.do_colouration)
 				hair.Blend(rgb(H.r_hair, H.g_hair, H.b_hair), ICON_ADD)
 				eyes.Blend(rgb(H.r_eyes, H.g_eyes, H.b_eyes), ICON_ADD)

colonialmarines.dme

@@ -2502,6 +2502,7 @@
 #include "maps\_basemap.dm"
 #include "maps\map_files\golden_arrow_forecon\area.dm"
 #include "maps\map_files\LV671_Ark\LV671.dm"
+#include "maps\map_files\tempestbreaker\tempest_area.dm"
 #include "maps\map_files\USCSS_Tortuga\tortuga_areas.dm"
 #include "void-marines\code\admin_tools.dm"
 #include "void-marines\code\chair_shifting.dm"
@@ -2525,4 +2526,15 @@
 #include "void-marines\code\playable_factions\shuttles.dm"
 #include "void-marines\code\playable_factions\stuff.dm"
 #include "void-marines\code\playable_factions\faction_paygrades\freelancer.dm"
+#include "void-marines\wh40k\code\droppod.dm"
+#include "void-marines\wh40k\code\shit.dm"
+#include "void-marines\wh40k\code\trenches.dm"
+#include "void-marines\wh40k\code\astartes\armour.dm"
+#include "void-marines\wh40k\code\astartes\astartes.dm"
+#include "void-marines\wh40k\code\astartes\classes.dm"
+#include "void-marines\wh40k\code\astartes\quotes.dm"
+#include "void-marines\wh40k\code\astartes\weapon.dm"
+#include "void-marines\wh40k\code\krieg\krieg.dm"
+#include "void-marines\wh40k\code\krieg\outfit.dm"
+#include "void-marines\wh40k\code\krieg\weapon.dm"
 // END_INCLUDE

map_config/maps.txt

@@ -93,3 +93,6 @@ endmap
 
 map whiskey_outpost_ru
 endmap
+
+map forge_defence
+endmap

map_config/shipmaps.txt

@@ -44,5 +44,9 @@ endmap
 map tortuga
 endmap
 
+
+map tempestbreaker
+endmap
+
 map golden_arrow_forecon
 endmap

maps/forge_defence.json

@@ -0,0 +1,38 @@
+{
+    "map_name": "Forge Defence",
+    "map_path": "map_files/forge_defence",
+    "map_file": "forge_defence.dmm",
+    "webmap_url": "Trijent",
+    "survivor_types": [
+        "/datum/equipment_preset/survivor/doctor/trijent",
+        "/datum/equipment_preset/survivor/roughneck",
+        "/datum/equipment_preset/survivor/chaplain/trijent",
+        "/datum/equipment_preset/survivor/interstellar_commerce_commission_liason",
+        "/datum/equipment_preset/survivor/colonial_marshal",
+        "/datum/equipment_preset/survivor/engineer/trijent",
+        "/datum/equipment_preset/survivor/engineer/trijent/hydro",
+        "/datum/equipment_preset/survivor/trucker/trijent",
+        "/datum/equipment_preset/survivor/security/trijent",
+        "/datum/equipment_preset/survivor/clf",
+        "/datum/equipment_preset/survivor/civilian"
+    ],
+    "defcon_triggers": [
+        3300,
+        2100,
+        1450,
+        580,
+        0.0
+    ],
+    "map_item_type": "/obj/item/map/desert_dam",
+    "announce_text": "We've lost contact with Weyland-Yutani's extra-solar colony, \"Trijent Dam\", on the planet \"Raijin.\" The ###SHIPNAME### has been dispatched to assist.",
+    "monkey_types": [
+        "stok"
+    ],
+    "traits": [{ "Ground": true }],
+    "nightmare_path": "maps/Nightmare/maps/DesertDam/",
+    "camouflage": "desert",
+    "gamemodes": [
+        "Distress Signal",
+        "Infection"
+    ]
+}

maps/map_files/tempestbreaker/tempest_area.dm

@@ -0,0 +1,9 @@
+/area/tempestbreaker
+	icon = 'icons/turf/area_almayer.dmi'
+	icon_state = "almayer"
+	ceiling = CEILING_METAL
+	powernet_name = "golden_arrow"
+	sound_environment = SOUND_ENVIRONMENT_ROOM
+	soundscape_interval = 30
+	ambience_exterior = AMBIENCE_ALMAYER
+	ceiling_muffle = FALSE

maps/shuttles/droppod.dmm

@@ -0,0 +1,26 @@
+"a" = (/turf/template_noop,/area/space)
+"b" = (/obj/structure/machinery/prop/almayer/CICmap/yautja{faction = "Astartes"; minimap_type = 2; pixel_y = 11},/obj/structure/surface/table/reinforced/black,/turf/open/floor/corsat{icon_state = "marked"},/area/shuttle/ert)
+"k" = (/obj/structure/machinery/door/poddoor/almayer/blended/open{id = "droppodast"},/turf/open/floor/hybrisa/metal/stripe_red{dir = 4},/area/shuttle/ert)
+"s" = (/obj/structure/bed/chair/hunter{dir = 4},/turf/open/floor/hybrisa/metal/grated,/area/shuttle/ert)
+"u" = (/turf/open/hybrisa/dropship/dropship3,/area/shuttle/ert)
+"A" = (/turf/open/hybrisa/dropship/dropship1,/area/shuttle/ert)
+"B" = (/obj/structure/machinery/door/poddoor/almayer/blended/open{id = "droppodast"},/turf/open/floor/hybrisa/metal/stripe_red{dir = 1},/area/shuttle/ert)
+"F" = (/obj/structure/machinery/door/poddoor/almayer/blended/open{id = "droppodast"},/turf/open/floor/hybrisa/metal/stripe_red{dir = 8},/area/shuttle/ert)
+"H" = (/obj/structure/bed/chair/hunter{dir = 8},/obj/structure/machinery/door_control{id = "droppodast"; name = "Hangar Access"; pixel_y = -19},/turf/open/floor/hybrisa/metal/grated,/area/shuttle/ert)
+"I" = (/obj/structure/bed/chair/hunter{dir = 1},/turf/open/floor/hybrisa/metal/grated{dir = 4},/area/shuttle/ert)
+"K" = (/turf/open/hybrisa/dropship/dropship2,/area/shuttle/ert)
+"Q" = (/obj/structure/bed/chair/hunter,/turf/open/floor/hybrisa/metal/grated{dir = 4},/area/shuttle/ert)
+"S" = (/obj/structure/machinery/door/poddoor/almayer/blended/open{id = "droppodast"},/turf/open/floor/hybrisa/metal/stripe_red,/area/shuttle/ert)
+"U" = (/obj/structure/bed/chair/hunter{dir = 8},/turf/open/floor/hybrisa/metal/grated,/area/shuttle/ert)
+"X" = (/turf/closed/wall/almayer,/area/shuttle/ert)
+"Z" = (/turf/open/hybrisa/dropship/dropship4,/area/shuttle/ert)
+
+(1,1,1) = {"
+aaXBXaa
+XXXQXXX
+aXsAUXa
+aFubZka
+aXsKHXa
+XXXIXXX
+aaXSXaa
+"}

maps/tempestbreaker.json

@@ -0,0 +1,8 @@
+{
+    "map_name": "Warhammer 40k",
+    "map_path": "map_files/tempestbreaker",
+    "map_file": "tempestbreaker.dmm",
+    "webmap_url": "GoldenArrow",
+    "traits": [{"Marine Main Ship": true}],
+    "nightmare_path": "maps/Nightmare/maps/golden_arrow_classic_RU/"
+}