Skip to content

Commit

Permalink
Covenant Update
Browse files Browse the repository at this point in the history
  • Loading branch information
YourPalHolidays committed Dec 19, 2023
1 parent 4b0f1d1 commit a7050a6
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 8 deletions.
1 change: 1 addition & 0 deletions baystation12.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1648,6 +1648,7 @@
#include "code\modules\halo\covenant\structures_machines\lekgolo_spawner.dm"
#include "code\modules\halo\covenant\structures_machines\lights.dm"
#include "code\modules\halo\covenant\structures_machines\modular_computer.dm"
#include "code\modules\halo\covenant\structures_machines\newscaster.dm"
#include "code\modules\halo\covenant\structures_machines\pillar_lift.dm"
#include "code\modules\halo\covenant\structures_machines\pinch_fusion.dm"
#include "code\modules\halo\covenant\structures_machines\plasmabattery.dm"
Expand Down
4 changes: 4 additions & 0 deletions code/modules/halo/covenant/structures_machines/covvendors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -668,3 +668,7 @@
/obj/item/weapon/reagent_containers/blood/empty = 12,
/obj/item/weapon/reagent_containers/spray/cleaner = 2
)

/obj/machinery/smartfridge/chemistry/covenant
icon = 'code/modules/halo/covenant/structures_machines/smartfridge.dmi'
icon_state = "smartfridge"
4 changes: 4 additions & 0 deletions code/modules/halo/covenant/structures_machines/newscaster.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

/obj/machinery/newscaster/covenant
icon = 'code/modules/halo/covenant/structures_machines/newscaster.dmi'
icon_state = "newscaster_covenant"
Binary file not shown.
Binary file not shown.
7 changes: 7 additions & 0 deletions code/modules/halo/weapons/automated_AA.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@
faction_nofire = "unsc"
pixel_x = -7

/obj/structure/automated_anti_air/covenant
name = "Type-14 Anti-Aircraft Cannon"
icon_state = "covenant_anti_air"
fire_anim_state = "covenant_anti_air_active"
faction_nofire = "covenant"
pixel_x = -7

/obj/structure/automated_anti_air/Initialize()
. = ..()
create_triggers()
Expand Down
Binary file modified code/modules/halo/weapons/icons/automated_anti_air.dmi
Binary file not shown.
Binary file modified icons/obj/terminals.dmi
Binary file not shown.
22 changes: 14 additions & 8 deletions maps/CRS_Unyielding_Transgression/CRS_Unyielding_Transgression.dmm

Large diffs are not rendered by default.

0 comments on commit a7050a6

Please sign in to comment.