cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 04:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Himeo Ship (#20835)

Browse Source 
Adds a Himean Patrol Corvette, along with all of its associated
features. Also adds the Nephilim blaster repeater cannon.

D1

![image](https://github.com/user-attachments/assets/b1693a9f-e095-4cf0-b2f8-4c53f0c3698d)
D2

![image](https://github.com/user-attachments/assets/4521c1fe-d542-411b-bc15-e332ab34fa97)
Submaps

![image](https://github.com/user-attachments/assets/0d8e290d-cd09-43d1-9d58-3027871cdc7c)


- [x] Fix the merge conflict
- [x] Role descriptions
- [x] Remember to delete the gold marker tiles
- [x] Door names
- [x] Deck 2 Atmos

---------

Co-authored-by: steviii <cormallenfield123@gmail.com>
This commit is contained in:
Stev-the-third
2025-07-01 15:51:52 +00:00
committed by GitHub
co-authored by steviii
parent cde97b7aa3
commit b52a5c8e49
32 changed files with 145437 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/factions/himeo.dm
+18
View File
@@ -20,3 +20,21 @@
icon_state = "cap_himeo"
item_state = "cap_himeo"
contained_sprite = TRUE
/obj/item/clothing/head/softcap/himeo_pg_cover
name = "himean planetary guard utility cover"
desc = "A utility cover of Himean origin. This particular cap has the united syndicates of Himeo's typical symbol - a white hexagon by red triangles - on its face."
desc_extended = "The M293 utility cover is a standard-issue cap for Himeo's planetary guard. It is part of the standard base dress for the Himean planetary guard, and is thus a common sight throughout vessels across the Coalition."
icon = 'icons/clothing/under/uniforms/himeo_military.dmi'
icon_state = "himeo_pg_utility"
item_state = "himeo_pg_utility"
contained_sprite = TRUE
/obj/item/clothing/head/sidecap/himeo_navy_cap
name = "himean naval garrison cap"
desc = "A sidecap of Himean origin. This particular sidecap has the United Syndicates of Himeo's typical symbol"
desc_extended = "The M361 garrison cap is a standard-issue softcover for the Planetary Guard's naval component. On the front is a small roundel containing the United Syndicates' national colors: black, white, and red."
icon = 'icons/clothing/under/uniforms/himeo_military.dmi'
icon_state = "himeo_navy_sidecap"
item_state = "himeo_navy_sidecap"
contained_sprite = TRUE
code/modules/clothing/head/pilot_helmet.dm
+6
View File
@@ -158,6 +158,12 @@
item_state = "legion_pilot"
camera = /obj/machinery/camera/network/tcfl
/obj/item/clothing/head/helmet/pilot/himeo
name = "himean naval flight helmet"
desc = "A helmet with a pilots visor attached, painted in the drab tan colours of the Himean navy uniform. The visor feeds its wearer in-flight information via an integrated heads-up display."
icon_state = "pilot_helmet_himeo"
item_state = "pilot_helmet_himeo"
/obj/pilot_overlay_holder
name = null
icon = null
code/modules/clothing/spacesuits/rig/suits/station.dm
+9
View File
@@ -133,6 +133,15 @@
helm_type = /obj/item/clothing/head/helmet/space/rig/industrial/himeo
chest_type = /obj/item/clothing/suit/space/rig/industrial/himeo
/obj/item/rig/industrial/himeo/equipped
initial_modules = list(
/obj/item/rig_module/mounted/plasmacutter,
/obj/item/rig_module/device/drill,
/obj/item/rig_module/device/orescanner,
/obj/item/rig_module/device/rfd_c,
/obj/item/rig_module/actuators,
/obj/item/rig_module/maneuvering_jets
)
/obj/item/rig/eva
name = "EVA suit control module"
suit_type = "EVA hardsuit"
code/modules/clothing/under/miscellaneous.dm
+78
View File
@@ -825,3 +825,81 @@
armor = list(
MELEE = ARMOR_MELEE_MINOR
)
//Himean Army
/obj/item/clothing/under/himeo
name = "himean planetary guard fatigues"
desc = "Reinforced synthetic fibres make up the bulk of this Himean planetary guard uniform, with hard plastic pads around the joints."
icon = 'icons/clothing/under/uniforms/himeo_military.dmi'
icon_state = "himeo_fatigues"
item_state = "himeo_fatigues"
contained_sprite = TRUE
siemens_coefficient = 0.5
armor = list(
MELEE = ARMOR_MELEE_KNIVES,
BULLET = ARMOR_BALLISTIC_MINOR,
LASER = ARMOR_LASER_MINOR
)
/obj/item/clothing/under/himeo/officer
name = "himean planetary guard officers fatigues"
desc = "Reinforced synthetic fibres make up the bulk of this Himean planetary guard uniform, with hard plastic pads around the joints. It is embellished with blue detailing, signalling the wearer as an officer."
icon_state = "himeo_fatigues_officer"
item_state = "himeo_fatigues_officer"
/obj/item/clothing/under/himeo/engineer
name = "himean planetary guard sappers fatigues"
desc = "Reinforced synthetic fibres make up the bulk of this Himean planetary guard uniform, with hard plastic pads around the joints. It is embellished with orange detailing, signalling the wearer as a sapper."
icon_state = "himeo_fatigues_engi"
item_state = "himeo_fatigues_engi"
/obj/item/clothing/under/himeo/medic
name = "himean planetary guard corpsmans fatigues"
desc = "Reinforced synthetic fibres make up the bulk of this Himean planetary guard uniform, with hard plastic pads around the joints. It is embellished with green detailing, signalling the wearer as a corpsman."
icon_state = "himeo_fatigues_medic"
item_state = "himeo_fatigues_medic"
/obj/item/clothing/under/himeo/pilot
name = "himean planetary guard pilots fatigues"
desc = "Reinforced synthetic fibres make up the bulk of this Himean planetary guard uniform, with hard plastic pads around the joints. It is embellished with red detailing, signalling the wearer as a fighter pilot."
icon_state = "himeo_fatigues_pilot"
item_state = "himeo_fatigues_pilot"
//Himean Navy
/obj/item/clothing/under/himeo/navy
name = "himean naval fatigues"
desc = "Tough synthetic fibres make up the bulk of this Himean planetary guard naval uniform, dyed a deep navy blue."
icon = 'icons/clothing/under/uniforms/himeo_military.dmi'
icon_state = "himeo_coveralls"
item_state = "himeo_coveralls"
contained_sprite = TRUE
siemens_coefficient = 0.5
armor = list(
MELEE = ARMOR_MELEE_KNIVES,
BULLET = ARMOR_BALLISTIC_MINOR,
LASER = ARMOR_LASER_MINOR
)
/obj/item/clothing/under/himeo/navy/officer
name = "himean naval commanders fatigues"
desc = "Tough synthetic fibres make up the bulk of this Himean planetary guard naval uniform, dyed a deep navy blue. It is embellished with blue detailing, signalling the wearer as an officer."
icon_state = "himeo_coveralls_officer"
item_state = "himeo_coveralls_officer"
/obj/item/clothing/under/himeo/navy/engineer
name = "himean naval sappers fatigues"
desc = "Tough synthetic fibres make up the bulk of this Himean planetary guard naval uniform, dyed a deep navy blue=. It is embellished with orange detailing, signalling the wearer as a sapper."
icon_state = "himeo_coveralls_engi"
item_state = "himeo_coveralls_engi"
/obj/item/clothing/under/himeo/navy/medic
name = "himean naval corpsmans fatigues"
desc = "Tough synthetic fibres make up the bulk of this Himean planetary guard naval uniform, dyed a deep navy blue. It is embellished with green detailing, signalling the wearer as a corpsman."
icon_state = "himeo_coveralls_medic"
item_state = "himeo_coveralls_medic"
/obj/item/clothing/under/himeo/navy/pilot
name = "himean naval pilots fatigues"
desc = "Tough synthetic fibres make up the bulk of this Himean planetary guard naval uniform, dyed a deep navy blue. It is embellished with red detailing, signalling the wearer as a fighter pilot."
icon_state = "himeo_coveralls_pilot"
item_state = "himeo_coveralls_pilot"
code/modules/overmap/ship_weaponry/weaponry/nephilim.dm
+63
View File
@@ -0,0 +1,63 @@
/obj/machinery/ship_weapon/nephilim
name = "nephilim blaster repeater"
desc = "The Nephilim is a reliable blaster repeater produced on-contract by several factories across the spur. Seeing widespread use on both sides of the piracy epidemic in the Coalition, it has been shown to be effective and easy to maintain; two details not shared by earlier ship-mounted blaster weapons. Utilising hydrogen blaster cells, it is quicker to charge, while necessitating frequent reloads."
icon = 'icons/obj/machinery/ship_guns/nephilim.dmi'
icon_state = "weapon_base"
idle_power_usage = 1500
active_power_usage = 100000
max_ammo = 1
projectile_type = /obj/projectile/ship_ammo/nephilim
caliber = SHIP_CALIBER_BLASTER
screenshake_type = SHIP_GUN_SCREENSHAKE_SCREEN
/obj/machinery/ship_weapon/nephilim/pre_fire(/atom/target, /obj/effect/landmark/landmark)
for(var/mob/M in GLOB.living_mob_list)
if(AreConnectedZLevels(GET_Z(M), z))
sound_to(M, sound('sound/weapons/gunshot/ship_weapons/gatling_laser.ogg'))
flick("weapon_charging", src)
sleep(1.1 SECONDS)
. = ..()
/obj/machinery/ammunition_loader/nephilim
name = "nephilim ammunition loader"
/obj/item/ship_ammunition/nephilim
name = "Blaster HE hydrogen cell"
name_override = "Blaster HE burst"
desc = "A hydrogen cell for use in a Nephilim blaster repeater, carefully tuned for higher damage and spread at the cost of armour penetration."
icon = 'icons/obj/guns/ship/ship_ammo_nephilim.dmi'
icon_state = "repeater_he"
overmap_icon_state = "light_laser_salvo"
impact_type = SHIP_AMMO_IMPACT_HE
ammunition_flags = SHIP_AMMO_FLAG_INFLAMMABLE|SHIP_AMMO_FLAG_VERY_HEAVY|SHIP_AMMO_FLAG_INFLAMMABLE
caliber = SHIP_CALIBER_BLASTER
burst = 15
cookoff_heavy = 0
/obj/item/ship_ammunition/nephilim/ap
name = "Blaster AP hydrogen cell"
name_override = "Blaster AP burst"
desc = "A hydrogen cell for use in a Nephilim blaster repeater, carefully tuned for higher armour penetration at the cost of damage."
icon = 'icons/obj/guns/ship/ship_ammo_nephilim.dmi'
icon_state = "repeater_ap"
impact_type = SHIP_AMMO_IMPACT_AP
/obj/projectile/ship_ammo/nephilim
name = "hydrogen cell he"
icon = 'icons/obj/guns/ship/physical_projectiles.dmi'
icon_state = "blaster_burst"
damage = 40
armor_penetration = 40
penetrating = 0
/obj/projectile/ship_ammo/nephilim/ap
name = "hydrogen cell ap"
damage = 20
armor_penetration = 100
penetrating = 4
/obj/projectile/ship_ammo/nephilim/he/on_hit(atom/target, blocked, def_zone, is_landmark_hit)
. = ..()
explosion(target, 0, 2, 3)
code/modules/reagents/reagent_dispenser.dm
+6
View File
@@ -401,6 +401,12 @@
icon_state = "woodkeg"
reagents_to_add = list(/singleton/reagent/alcohol/sake = 1000)
/obj/structure/reagent_dispensers/keg/kvass
name = "kvass keg"
desc = "A keg full of Dorshafen kvass - non-alcoholic, and a common sight in any workers home across Himeo."
icon_state = "keg_kvass"
reagents_to_add = list(/singleton/reagent/drink/mushroom_kvass = 1000)
//Cooking oil tank
/obj/structure/reagent_dispensers/cookingoil
name = "cooking oil tank"