diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ueg_crash1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ueg_crash1.dmm new file mode 100644 index 00000000000..b4d1cd955a0 --- /dev/null +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ueg_crash1.dmm @@ -0,0 +1,93 @@ +"aa" = (/turf/template_noop,/area/template_noop) +"ab" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) +"ac" = (/turf/closed/mineral/volcanic/lava_land_surface,/area/lavaland/surface/outdoors) +"ad" = (/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/lavaland/surface/outdoors) +"ae" = (/turf/open/floor/plating,/area/lavaland/surface/outdoors) +"af" = (/turf/open/floor/plating/lava/smooth/lava_land_surface,/area/lavaland/surface/outdoors) +"ag" = (/obj/machinery/door/airlock/hatch{name = "Assault Pods"; req_access_txt = "101"},/obj/machinery/door/poddoor/preopen{desc = "A anti-breach blast door that has been forced open."; name = "anti-breach blast door"},/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"ah" = (/obj/machinery/door/poddoor{name = "anti-breach blast door"},/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"ai" = (/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/ruin/powered) +"aj" = (/obj/structure/sign/poster/official/safety_internals,/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/ruin/powered) +"ak" = (/obj/effect/decal/cleanable/blood/gibs/body,/obj/item/weapon/pickaxe/drill,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"al" = (/obj/item/stack/sheet/metal,/turf/open/floor/plasteel/black,/area/ruin/powered) +"am" = (/obj/effect/decal/cleanable/blood,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"an" = (/obj/item/weapon/rack_parts,/obj/item/weapon/survivalcapsule,/turf/open/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/ruin/powered) +"ao" = (/obj/effect/decal/cleanable/robot_debris,/turf/open/floor/plating,/area/ruin/powered) +"ap" = (/turf/open/floor/plasteel/black,/area/ruin/powered) +"aq" = (/obj/effect/decal/cleanable/vomit,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"ar" = (/obj/machinery/portable_atmospherics/canister/oxygen{maximum_pressure = 1019.25},/turf/open/floor/plasteel/black,/area/ruin/powered) +"as" = (/turf/open/floor/plating,/area/ruin/powered) +"at" = (/obj/item/ammo_box/magazine/carbine,/turf/open/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/ruin/powered) +"au" = (/obj/item/clothing/mask/breath,/turf/open/floor/plasteel/black,/area/ruin/powered) +"av" = (/obj/effect/decal/cleanable/blood/gibs/body,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"aw" = (/obj/machinery/door/airlock/hatch{name = "Delta Squad Armoury"; req_access_txt = "101"},/turf/open/floor/plasteel/vault{dir = 8},/area/ruin/powered) +"ax" = (/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"ay" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/open/floor/plating,/area/ruin/powered) +"az" = (/obj/item/clothing/glasses/meson,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"aA" = (/obj/structure/rack,/obj/item/weapon/storage/firstaid/tactical,/obj/item/device/flashlight/seclite{desc = "A robust flashlight used by the military."; name = "combat flashlight"},/obj/item/weapon/kitchen/knife/combat/survival{name = "military knife"},/obj/item/weapon/survivalcapsule,/obj/item/ammo_box/magazine/carbine,/obj/item/ammo_box/magazine/carbine,/obj/item/weapon/gun/ballistic/automatic/carbine,/turf/open/floor/plating,/area/ruin/powered) +"aB" = (/obj/machinery/suit_storage_unit/ueg{name = "Marine Armour Storage Unit"},/turf/open/floor/plating,/area/ruin/powered) +"aC" = (/turf/open/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/lavaland/surface/outdoors) +"aD" = (/obj/machinery/door/airlock/hatch{name = "Armoury"; req_access_txt = "101"},/turf/open/floor/plasteel/black,/area/ruin/powered) +"aE" = (/turf/open/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/ruin/powered) +"aF" = (/turf/open/floor/plasteel/vault{dir = 5},/area/lavaland/surface/outdoors) +"aG" = (/turf/open/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/lavaland/surface/outdoors) +"aH" = (/obj/structure/sign/poster/official/help_others,/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/ruin/powered) +"aI" = (/obj/effect/decal/cleanable/vomit,/turf/open/floor/plating,/area/ruin/powered) +"aJ" = (/turf/open/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/ruin/powered) +"aK" = (/turf/open/floor/plating{tag = "icon-platingdmg1"; icon_state = "platingdmg1"},/area/lavaland/surface/outdoors) +"aL" = (/obj/effect/decal/cleanable/blood/old,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"aM" = (/obj/structure/closet,/obj/item/toy/prize/honk,/turf/open/floor/plasteel/vault{dir = 5},/area/lavaland/surface/outdoors) +"aN" = (/obj/structure/sign/poster/contraband/clown,/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/lavaland/surface/outdoors) +"aO" = (/turf/open/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/ruin/powered) +"aP" = (/obj/structure/sign/poster/official/walk,/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/ruin/powered) +"aQ" = (/obj/effect/decal/cleanable/oil,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"aR" = (/obj/machinery/door/airlock/hatch{name = "Personal Quarters D"; req_access_txt = "101"},/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"aS" = (/obj/structure/sign/poster/official/enlist{desc = "Enlist in the marine corps today!"},/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/ruin/powered) +"aT" = (/obj/effect/decal/cleanable/robot_debris,/turf/open/floor/plasteel/black,/area/ruin/powered) +"aU" = (/obj/effect/decal/cleanable/blood,/obj/structure/closet,/obj/item/weapon/storage/box/donkpockets,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"aV" = (/turf/open/floor/plasteel/vault{dir = 5},/turf/open/floor/plating{tag = "icon-platingdmg2"; icon_state = "platingdmg2"},/area/ruin/powered) +"aW" = (/obj/structure/closet,/obj/item/clothing/shoes/combat,/obj/item/clothing/under/syndicate/camo,/obj/item/weapon/storage/box/donkpockets,/obj/item/clothing/gloves/combat,/obj/item/weapon/storage/backpack/explorer{name = "marine bag"},/obj/item/weapon/card/id/marine,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"aX" = (/obj/structure/dresser,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"aY" = (/obj/effect/decal/cleanable/blood/gibs/body,/turf/open/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/ruin/powered) +"aZ" = (/obj/effect/decal/cleanable/blood/gibs,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"ba" = (/obj/structure/girder,/turf/open/floor/plating{tag = "icon-platingdmg3"; icon_state = "platingdmg3"},/area/ruin/powered) +"bb" = (/obj/structure/sign/poster/contraband/space_cola,/turf/closed/wall/mineral/plastitanium{desc = "An wall of plasma and titanium."},/area/ruin/powered) +"bc" = (/obj/structure/table_frame,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"bd" = (/obj/effect/mob_spawn/human/marine,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) +"be" = (/obj/structure/table,/obj/effect/holodeck_effect/cards,/turf/open/floor/plasteel/vault{dir = 5},/area/ruin/powered) + +(1,1,1) = {" +aaaaaaaaabaaaaaaaaaaaaaaabaaaaaaaaaaababacacaaaaaaaaaaaa +aaaaaaabababaaaaababababababaaaaaaabababacacacaaabababaa +aaaaabababababababababababababababababababacacacabababaa +aaaaababababadaeabababababababacacababababababababababaa +acacabababababaeababababababababacababababababababacaaaa +acababacababababadadabadababababacababababababababacaaaa +abababacababababadaeabaeabaeababababababababababababaaaa +acababacabababababababaeabadababababababababababababaaaa +aaababababadaeabacacacababaeababaeadafabababababacababaa +aaaaabababadaeacacagahahaiaiaiaiadadafababababababababaa +aaaaabababababacajakalamaianaoaiaeafafafabababacabababaa +aaaaabababababaeaiapaqaraiasataiahahaiafabababababababaa +aaaaabababafafaeahamauavawaxaxaxaxamayafafababababababaa +acacabafafafafafaiapaxapaiaxaxaiahahaiafafabafafafababaa +acacafafafafafaeaiazapaxaiaAaBaiaCaeafafafafafafafafaaaa +acacafafafafadadaiaDayaDaiaiaiaiaiadadafafafafafafafafaa +abacafafafafaeaeaiaxapaxaiaEavaoaiaFaGafafafafafafafafaa +ababafafafafafaeaiapaxapaHasaIaJaiaeaCaKafafafafafafafaa +ababafafafafafaeaiaxapaLaiamaEaJaiaMaeaeaNabafafafafaaaa +acabafafafafaCadaiapaxapaiaiaiaOaPaiaiahaiabafafafafafaa +acabafafafaeaeaGahaxapaxapasaEaJapaxapaxayababafafafaaaa +acabafafafaCaKaCahapaQapaxapaxasaxapaxapayababafafafafaa +acabafafafafaeaeaiaxapaxaiaiaiahaiaiaiaRaiababafafafafaa +acabafafafafafafaSaTaxapaiaUaVaxaiaWaXaxaiabafafafafafaa +acabafafafafafafaiahahahaiaEaYaZbaaxaxaxbbabafafafafafaa +acacafafafafafafafaeaKaeaiaoambcaibdaxbeaiabafafafafafaa +aaafafafafafafafafaeaeafaiaiaiaiaiaiaiaiaiabafafafafafaa +aaafafafafafafafafafafafafafafafafaeaeadababafafafafafaa +aaafafafafafabababafafafafafafafafafafadafafafafafafafaa +aaafafafafafababababababafafafafafafafafafafafafafafafaa +aaafafabababaeabadabababababababafafafafafafafafafafafaa +aaafafafababaKabaGadabababaaaaaaaaaaaaaaaaafafafafafafaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +"} diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index 011363f0019..6b4076623eb 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -183,3 +183,11 @@ suffix = "lavaland_surface_swarmer_crash.dmm" allow_duplicates = FALSE cost = 20 + +/datum/map_template/ruin/lavaland/marine_crash + name = "Crashed Marine Transport" + id = "marine" + description = "A Marine Transport that has crashed, with one sole survivor" + suffix = "lavaland_surface_ueg_crash1.dmm" + allow_duplicates = FALSE + cost = 20 diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index f64f7617367..be062657645 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -102,6 +102,11 @@ mask_type = /obj/item/clothing/mask/breath storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double +/obj/machinery/suit_storage_unit/ueg + suit_type = /obj/item/clothing/suit/space/hardsuit/ueg + mask_type = /obj/item/clothing/mask/gas/sechailer/swat + storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double + /obj/machinery/suit_storage_unit/New() ..() wires = new /datum/wires/suit_storage_unit(src) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 95892088d86..297c3f035ef 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -249,6 +249,17 @@ update_label("John Doe", "Clowny") access = get_all_accesses()+get_ert_access("med")-GLOB.access_change_ids ..() +/obj/item/weapon/card/id/marine + name = "\improper Marine ID" + desc = "A Marine Rifleman ID card" + icon_state = "centcom" + registered_name = "Iron Hawk Marine" + assignment = "Marine Rifleman" + +/obj/item/weapon/card/id/marine/Initialize() + access = get_all_centcom_access() + ..() + /obj/item/weapon/card/id/prisoner name = "prisoner ID card" desc = "You are a number, you are not a free man." diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index a15e2803df8..cafd0b87e6d 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -371,3 +371,51 @@ back = /obj/item/weapon/storage/backpack implants = list(/obj/item/weapon/implant/mindshield) //No revolutionaries, he's MY friend. id = /obj/item/weapon/card/id + +//UEG Marine +/obj/effect/mob_spawn/human/marine + name = "marine cryostasis sleeper" + desc = "A humming sleeper with a occupant inside. Desperatly attempting to revive the occupant despite its low power state." + mob_name = "a iron hawk marine" + icon = 'icons/obj/lavaland/spawners.dmi' + icon_state = "cryostasis_sleeper" + roundstart = FALSE + death = FALSE + random = TRUE + mob_species = /datum/species/human + flavour_text = "You are a Iron Hawk Marine, apart of a unalligned mercenary organization. You were, until recently, stationed on board the IHSS Inheritor, a capital ship. As you struggle \ + to exit your cryostasis sleeper, you slowly start to recall exactly what cause of events has thrown you into your current predicament... " + +/obj/effect/mob_spawn/human/marine/Initialize(mapload) + . = ..() + var/lorpee = rand(1,4) + switch(lorpee) + if(1) + flavour_text += "Your ship intercepted a distress call from a distant space station. As the Inheritor moved into investigate, suddenly and without warning the ship was being assaulted \ + by a massive lovecraftian nightmare, you heard the name 'Nar-Sie' being uttered by the barely Human flesh monsters and constructs that poured out of every crack that was torn into the \ + ship by the monster. With most of the crew dead, you and your squad retreated to the hanger bay, rescued a group of pilots and attempted to flee aboard the only functional heavy troop transport. \ + Your attempt to fly away was halted when Nar-Sie somehow was able to start attempting to drag the transport into her grasp. In one final desperate move, the pilots turnd the ship around \ + and ramed it directly into Nar-Sie's head, her screams somehow echoed throughout the transport as she released her grasp on the transport, unfortunately taking half the engines with her. \ + Your final thoughts were panic as you quickly dove into your cryosleep pod, hoping you'll survive the crash landing." + if(2) + flavour_text += "Panic and paranoia ran high as a group of changelings somehow infiltrated the Inheritor. Utterly unprepared to deal with this threat, the crew tore itself apart. \ + In a final desperate move to end the changeling threat, the ship's Commander activated the Inheritor's self destruct sequence and remotely shut down all escape pods. You and your \ + squadmates, who were already on the brink of a psychological breakdown, made a run for the last remaining heavy troop transport. You arrive to discover the changelings had a similar plan \ + , with minutes until the ship exploded, the changelings abandoned any pretense of subtly and revealed their true forms. After a intense gun fight you and your squad were able to board \ + the transport. However as you take off, one of the surviving Changelings was able to plant an explosive charge on your engines. The explosion disabled your ship, and you got caught in a \ + nearby planets gravity well. The survivors were forced into cryo sleep, as you're last thoughts were hoping to god none of your squad mates were secretly changelings." + if(3) + flavour_text += "The deeper reaches of space are home to hoards of pirates and marauders, usually they are no threat to a Iron Hawk capital ship. However, the Inheritor had conducted a \ + large series of anti-piracy raids in your assigned sector, so crippling that every pirate in the local sector network formed a massive fleet in a attempt to destroy the Inheritor. The \ + Inheritor won against all odds, but it was a pyrrhic victory as the Inheritor was byond repair. The acting Commander ordered all hands to abandon ship before it was scuttled. You and \ + your remaining squad members were assigned to troop transport 5. Unbeknown to you or your pilots, your fuel tanks had suffered a massive leak during the fighting, leaving you with minimal \ + fuel, thus your pilots had no choice but to land on a nearby planet. Strapping into your cryochamber, you can only hope that the pilots could land this thing safely." + if(4) + flavour_text += "The Inheritor was sent on a high level covert recon contract to Space Station 13, a Nanotrasen research and development station. The contract details were minimal sans that \ + you were to locate and ping any Nanotrasen mining bases on a class-H planet. You and your squad were dispatched in a recon heavy transport \ + to attempt to fly over the planet and locate any hidden Nanotrasen mining bases. About two hours into the recon mission, a giant, dragon like, creature swooped up and took a large part of your \ + engines with it. With insufficient thrust power to leave the planet's atmosphere, the crew were ordered into cryostasis as the pilots attempted an emergency landing." + +/obj/effect/mob_spawn/human/marine/Destroy() + new/obj/structure/fluff/empty_cryostasis_sleeper(get_turf(src)) + return ..() \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 5f7bf6d0606..c0d72e86110 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -79,6 +79,30 @@ Contains: max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | ACID_PROOF + //Marine Armour +/obj/item/clothing/head/helmet/space/hardsuit/ueg + name = "Iron Hawk Marine Helmet" + desc = "An armoured, pressurised, military helmet used as standard issue among Iron Hawk Marines." + icon_state = "ueghelm" + item_state = "ueghelm" + armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 90, rad = 70, fire = 100, acid = 100) + strip_delay = 120 + resistance_flags = FIRE_PROOF | ACID_PROOF + actions_types = list() + +/obj/item/clothing/head/helmet/space/hardsuit/ueg/attack_self(mob/user) + return + +/obj/item/clothing/suit/space/hardsuit/ueg + name = "Iron Hawk Marine Armour" + desc = "Modified MK.II SWAT Armour. Used by Iron Hawk Marines in ship to ship action. This model appears to have lost some of its armour plating during the crash." + icon_state = "uegarmor" + item_state = "uegarmor" + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals,/obj/item/weapon/kitchen/knife/combat) + armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 90, rad = 100, fire = 100, acid = 100) + strip_delay = 130 + resistance_flags = FIRE_PROOF | ACID_PROOF + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ueg //NASA Voidsuit /obj/item/clothing/head/helmet/space/nasavoid diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index d91859f1983..376e372cb6c 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -76,6 +76,11 @@ caliber = "4.6x30mm" projectile_type = /obj/item/projectile/bullet/incendiary/firebullet +/obj/item/ammo_casing/c46carbine + desc = "A 4.6x30mm bullet casing." + caliber = "4.6x30mm" + projectile_type = /obj/item/projectile/bullet/carbinebullet + /obj/item/ammo_casing/c45 desc = "A .45 bullet casing." caliber = ".45" diff --git a/code/modules/projectiles/boxes_magazines/external_mag.dm b/code/modules/projectiles/boxes_magazines/external_mag.dm index 3bfb90224dd..8ebcd1eab36 100644 --- a/code/modules/projectiles/boxes_magazines/external_mag.dm +++ b/code/modules/projectiles/boxes_magazines/external_mag.dm @@ -186,6 +186,14 @@ max_ammo = 30 multiple_sprites = 2 +/obj/item/ammo_box/magazine/carbine + name = "carbine magazine (4.6x30mm)" + icon_state = "oldrifle" + origin_tech = "combat=5" + ammo_type = /obj/item/ammo_casing/c46carbine + caliber = "4.6x30mm" + max_ammo = 32 + /obj/item/ammo_box/magazine/m12g name = "shotgun magazine (12g taser slugs)" desc = "A drum magazine." diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index f683add557f..0503a011b36 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -234,7 +234,16 @@ burst_size = 3 fire_delay = 1 - +/obj/item/weapon/gun/ballistic/automatic/carbine + name = "\improper Marine Carbine" + desc = "Standard issue weapon used by Iron Hawk Marines in space to space combat. Due to modifications for space combat, the weapon has a very limited firing range." + icon_state = "oldrifle" + item_state = "arg" + mag_type = /obj/item/ammo_box/magazine/carbine + fire_sound = 'sound/weapons/Gunshot_smg.ogg' + can_suppress = 0 + burst_size = 0 + fire_delay = 2 // Bulldog shotgun // diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 600fe4f2be7..e420be18d0b 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -20,6 +20,10 @@ /obj/item/projectile/bullet/weakbullet3 damage = 20 +/obj/item/projectile/bullet/carbinebullet + damage = 20 + range = 5 + /obj/item/projectile/bullet/toxinbullet damage = 15 damage_type = TOX diff --git a/config/lavaruinblacklist.txt b/config/lavaruinblacklist.txt index aec26764a59..5afb96f6cdc 100644 --- a/config/lavaruinblacklist.txt +++ b/config/lavaruinblacklist.txt @@ -14,6 +14,7 @@ #_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm #_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm +#_maps/RandomRuins/LavaRuins/lavaland_surface_surface_ueg_crash1.dmm ##SIN #_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 9d885fae89d..c3d7f83401b 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 9059f4e0587..ad069e411d5 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index ab41b5d2191..6e26c6d431f 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 6b0dd135f6e..ee3b03c66ca 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 3a59c48c2e1..62d132b183d 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index dd6146d7fb8..6a5b075b1d9 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ