Wh40k

code/__DEFINES/shuttles.dm

@@ -121,6 +121,7 @@
 #define DROPSHIP_TYPHOON "dropship_typhoon"
 #define DROPSHIP_TRIPOLI "dropship_tripoli"
 
+#define DROPSHIP_TINCAN "dropship_tincan" //RU-PVE
 #define DROPSHIP_RASPUTIN "dropship_rasputin" //RU-PVE
 #define DROPPOD_ASTARTES "astartes_droppod" //RU-PVE
 #define DROPSHIP_LANCER "dropship_lancer" //RU-PVE

code/modules/projectiles/gun.dm

@@ -33,6 +33,9 @@
 	var/muzzle_flash = "muzzle_flash"
 	///muzzle flash brightness
 	var/muzzle_flash_lum = 3
+	var/muzzle_flash_icon = 'icons/obj/items/weapons/projectiles.dmi'
+	// color of flash
+	var/muzzle_flash_color = COLOR_WHITE
 
 	var/fire_sound = 'sound/weapons/Gunshot.ogg'
 	/// If fire_sound is null, it will pick a sound from the list here instead.
@@ -1801,14 +1804,15 @@ not all weapons use normal magazines etc. load_into_chamber() itself is designed
 
 	var/prev_light = light_range
 	if(!light_on && (light_range <= muzzle_flash_lum))
+		set_light_color(muzzle_flash_color)
 		set_light_range(muzzle_flash_lum)
 		set_light_on(TRUE)
 		addtimer(CALLBACK(src, PROC_REF(reset_light_range), prev_light), 0.5 SECONDS)
 
 	var/image_layer = (user && user.dir == SOUTH) ? MOB_LAYER+0.1 : MOB_LAYER-0.1
 	var/offset = 5
 
-	var/image/I = image('icons/obj/items/weapons/projectiles.dmi',user,muzzle_flash,image_layer)
+	var/image/I = image(muzzle_flash_icon,user,muzzle_flash,image_layer)
 	var/matrix/rotate = matrix() //Change the flash angle.
 	rotate.Translate(0, offset)
 	rotate.Turn(angle)

colonialmarines.dme

@@ -2514,6 +2514,7 @@
 #include "void-marines\code\portable_detector.dm"
 #include "void-marines\code\rasputin.dm"
 #include "void-marines\code\special_roles.dm"
+#include "void-marines\code\tin_can.dm"
 #include "void-marines\code\vendors.dm"
 #include "void-marines\code\loadout_presets\rednecks.dm"
 #include "void-marines\code\modules\mob\living\carbon\human\emote.dm"
@@ -2533,6 +2534,7 @@
 #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\outfit.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"

maps/shuttles/space_can.dmm

@@ -0,0 +1,49 @@
+"a" = (/turf/template_noop,/area/template_noop)
+"b" = (/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy2{dir = 4},/obj/item/tool/weldingtool/hugetank{pixel_x = -12; pixel_y = 7},/turf/open/floor/almayer{dir = 4; icon_state = "silver"},/area/shuttle/ert)
+"g" = (/turf/open/floor/plating/plating_catwalk/prison,/area/shuttle/ert)
+"j" = (/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy3,/obj/effect/decal/cleanable/dirt,/turf/open/floor/almayer{dir = 4; icon_state = "silver"},/area/shuttle/ert)
+"l" = (/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy3{dir = 4},/turf/open/floor/almayer{dir = 4; icon_state = "silver"},/area/shuttle/ert)
+"n" = (/obj/structure/surface/table/reinforced/black,/obj/item/tool/hand_labeler{pixel_x = 7; pixel_y = 12},/obj/item/tool/crew_monitor{pixel_x = -7},/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy2,/obj/item/ammo_magazine/handful/shotgun/buckshot/special,/obj/item/ammo_magazine/handful/shotgun/buckshot/special,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating/plating_catwalk/prison,/area/shuttle/ert)
+"p" = (/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy3{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/open/floor/almayer{dir = 8; icon_state = "silver"},/area/shuttle/ert)
+"q" = (/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy3{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating/plating_catwalk/prison,/area/shuttle/ert)
+"r" = (/obj/structure/surface/table/reinforced/almayer_B,/obj/item/device/taperecorder{pixel_x = -10; pixel_y = -7},/obj/item/tape/regulation{pixel_x = -25; pixel_y = 21},/obj/effect/decal/cleanable/dirt,/obj/structure/machinery/computer/shuttle/dropship/flight{icon = 'icons/obj/structures/machinery/computer.dmi'; icon_state = "overwatch"; pixel_y = 20},/turf/open/floor/plating/plating_catwalk/prison,/area/shuttle/ert)
+"s" = (/obj/structure/closet/hydrant{pixel_y = 32},/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy2{dir = 4},/obj/structure/largecrate/supply/medicine{fill_from_loc = 1; layer = 2.9; name = "Medical Equipment"; pixel_y = 6},/obj/item/storage/pouch/autoinjector/full,/obj/item/storage/pouch/autoinjector/full,/obj/item/storage/pouch/medkit/full,/obj/item/storage/pouch/medical/full,/obj/item/storage/pouch/medical/full,/obj/item/storage/pill_bottle/bicaridine/skillless,/obj/item/storage/pill_bottle/bicaridine/skillless,/obj/item/storage/pill_bottle/kelotane/skillless,/obj/item/storage/pill_bottle/kelotane/skillless,/obj/item/storage/pill_bottle/tramadol/skillless,/obj/item/storage/pill_bottle/tramadol/skillless,/obj/item/storage/pill_bottle/iron,/obj/item/storage/pill_bottle/inaprovaline/skillless,/obj/item/storage/pill_bottle/inaprovaline/skillless,/obj/item/storage/pill_bottle/dexalin/skillless,/obj/item/storage/pill_bottle/alkysine/skillless,/obj/item/storage/firstaid/surgical,/obj/item/storage/firstaid/adv,/obj/item/storage/belt/medical/full/with_suture_and_graft,/obj/item/storage/pouch/first_responder/full,/turf/open/floor/almayer{icon_state = "test_floor4"},/area/shuttle/ert)
+"t" = (/obj/structure/machinery/big_computers/computerblack/computer4,/obj/item/weapon/gun/shotgun/pump{pixel_y = 12},/obj/effect/decal/cleanable/dirt,/turf/open/floor/almayer{icon_state = "plate"},/area/shuttle/ert)
+"u" = (/obj/structure/machinery/door_control{id = "can_inside"; pixel_x = -5; pixel_y = -20},/obj/structure/machinery/suit_storage_unit/compression_suit{pixel_x = 4},/turf/open/floor/almayer{icon_state = "test_floor4"},/area/shuttle/ert)
+"v" = (/turf/open/floor/almayer{dir = 8; icon_state = "silver"},/area/shuttle/ert)
+"w" = (/obj/structure/window/framed/prison/reinforced/hull,/turf/open/floor/plating,/area/shuttle/ert)
+"y" = (/obj/structure/machinery/door/poddoor/almayer/blended{id = "can_outer"},/turf/open/floor/almayer{icon_state = "test_floor4"},/area/shuttle/ert)
+"z" = (/turf/closed/wall/r_wall/prison_unmeltable,/area/shuttle/ert)
+"A" = (/obj/structure/machinery/big_computers/computerblack/computer5,/obj/item/device/motiondetector{pixel_y = 17},/obj/item/weapon/gun/revolver/spearhead/black{pixel_x = 3; pixel_y = -7},/turf/open/floor/almayer{icon_state = "plate"},/area/shuttle/ert)
+"B" = (/obj/structure/surface/table/reinforced/black,/obj/structure/machinery/big_computers/messaging_server/black{density = 0; layer = 2.8; pixel_y = -24},/obj/item/device/multitool{pixel_x = 5; pixel_y = 13},/obj/item/device/black_market_hacking_device{pixel_x = 2; pixel_y = 6},/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy2,/obj/item/tool/screwdriver{pixel_x = -26},/obj/effect/decal/cleanable/dirt,/obj/docking_port/mobile/marine_dropship/tin_can,/turf/open/floor/plating/plating_catwalk/prison,/area/shuttle/ert)
+"C" = (/obj/structure/machinery/suit_storage_unit/compression_suit,/turf/open/floor/almayer{icon_state = "test_floor4"},/area/shuttle/ert)
+"D" = (/obj/structure/machinery/door_display/research_cell{dir = 4; id = "can_outer"; name = "Airlock Control"; pixel_x = -12; pixel_y = 5},/obj/effect/decal/cleanable/dirt,/turf/open/floor/almayer{dir = 8; icon_state = "silver"},/area/shuttle/ert)
+"E" = (/obj/structure/machinery/door/poddoor/almayer/blended{id = "can_inside"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/almayer{icon_state = "test_floor4"},/area/shuttle/ert)
+"F" = (/obj/structure/largecrate/supply/weapons{fill_from_loc = 1; name = "Rescue Equipment"; pixel_x = -4; pixel_y = 13},/obj/item/storage/pouch/tools/full{pixel_y = 9},/obj/item/storage/pouch/tools/full,/obj/item/storage/pouch/tools/full{pixel_y = 9},/obj/item/storage/pouch/tools/full,/obj/item/tool/weldpack,/obj/item/tool/weldpack,/obj/item/weapon/gun/flamer/underextinguisher,/obj/item/weapon/twohanded/breacher{force_wielded = 45},/obj/item/weapon/ice_axe/red,/obj/item/weapon/ice_axe/red,/obj/effect/decal/cleanable/dirt,/turf/open/floor/almayer{icon_state = "test_floor4"},/area/shuttle/ert)
+"G" = (/obj/structure/machinery/door/poddoor/almayer/blended{id = "can_outer"},/obj/effect/decal/cleanable/dirt,/obj/effect/decal/cleanable/dirt,/turf/open/floor/almayer{icon_state = "test_floor4"},/area/shuttle/ert)
+"I" = (/obj/structure/bed/chair/dropship/passenger{dir = 4; pixel_y = 14},/obj/structure/bed/chair/dropship/passenger{dir = 4},/obj/structure/prop/hybrisa/misc/redmeter{name = "Hyper-bay control"; pixel_x = -25; pixel_y = 23},/obj/structure/prop/hybrisa/signs/high_voltage/small{pixel_x = -24; pixel_y = 41},/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy2{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/open/floor/almayer{icon_state = "test_floor5"},/area/shuttle/ert)
+"L" = (/obj/structure/bed/chair/dropship/passenger{dir = 8; pixel_y = 14},/obj/structure/bed/chair/dropship/passenger{dir = 8},/turf/open/floor/almayer{icon_state = "test_floor5"},/area/shuttle/ert)
+"M" = (/obj/structure/machinery/door/poddoor/almayer/blended{id = "can_inside"},/turf/open/floor/almayer{icon_state = "test_floor4"},/area/shuttle/ert)
+"O" = (/turf/open/floor/almayer{icon_state = "test_floor5"},/area/shuttle/ert)
+"P" = (/obj/structure/bed/chair/dropship/passenger{dir = 1},/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy4{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/open/floor/almayer{icon_state = "test_floor5"},/area/shuttle/ert)
+"Q" = (/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy2,/obj/structure/machinery/door/poddoor/almayer/blended{id = "can_inside"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/almayer{icon_state = "test_floor4"},/area/shuttle/ert)
+"R" = (/obj/item/weapon/gun/flare{pixel_x = -4; pixel_y = 5},/obj/item/ammo_box/magazine/misc/flares{pixel_x = 7},/turf/open/floor/almayer{dir = 8; icon_state = "silver"},/area/shuttle/ert)
+"S" = (/obj/structure/bed/chair/dropship/passenger{dir = 4; pixel_y = 14},/obj/structure/bed/chair/dropship/passenger{dir = 4},/obj/structure/closet/walllocker/emerglocker/west{pixel_x = -25; pixel_y = -25},/turf/open/floor/almayer{icon_state = "test_floor5"},/area/shuttle/ert)
+"T" = (/obj/structure/largecrate/supply{fill_from_loc = 1; layer = 2.9; name = "Various Supplies"; pixel_x = 2},/obj/item/storage/backpack/marine/satchel/intel,/obj/item/storage/backpack/marine/satchel/intel,/obj/item/storage/backpack/marine/satchel/intel,/obj/item/storage/backpack/marine/satchel/intel,/obj/item/storage/backpack/marine/satchel/intel,/obj/item/storage/backpack/marine/satchel/intel,/obj/item/storage/pouch/general/large,/obj/item/storage/pouch/general/large,/obj/item/stack/sheet/metal/med_large_stack,/obj/item/stack/sheet/metal/med_large_stack,/obj/item/stack/sheet/plasteel/med_small_stack,/obj/item/cell/apc,/obj/item/cell/apc,/obj/item/cell/apc,/obj/item/cell/apc,/obj/item/maintenance_jack,/obj/item/maintenance_jack,/obj/item/ammo_magazine/revolver/spearhead,/obj/item/ammo_magazine/revolver/spearhead,/obj/item/ammo_magazine/revolver/spearhead,/obj/item/ammo_magazine/revolver/spearhead,/obj/item/ammo_magazine/revolver/spearhead,/turf/open/floor/almayer{icon_state = "test_floor5"},/area/shuttle/ert)
+"U" = (/obj/item/device/walkman{pixel_x = -7; pixel_y = 15},/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy2,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating/plating_catwalk/prison,/area/shuttle/ert)
+"V" = (/obj/structure/prop/hybrisa/misc/fake/heavydutywire/heavy3{dir = 1},/obj/effect/decal/cleanable/dirt,/turf/open/floor/almayer{dir = 8; icon_state = "silver"},/area/shuttle/ert)
+"W" = (/obj/effect/decal/cleanable/dirt,/turf/open/floor/plating/plating_catwalk/prison,/area/shuttle/ert)
+"Y" = (/turf/open/floor/almayer{dir = 4; icon_state = "silver"},/area/shuttle/ert)
+
+(1,1,1) = {"
+azwwwza
+zztrAzz
+zFVPbsz
+zIpnYLz
+zOWBgTz
+zSRUYLz
+zCvqjuz
+zzMEQzz
+azDWlza
+azGyyza
+"}