Skip to content

Commit

Permalink
Merge pull request Civ13#2526 from Bierkraan/working-branch
Browse files Browse the repository at this point in the history
has_scope var
  • Loading branch information
Bierkraan authored Jan 9, 2024
2 parents 18e1538 + 794fdd9 commit 4460e8f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions code/modules/1713/siege/cannon_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
is_naval = TRUE
course = TRUE
naval_position = "middle"
has_scope = FALSE

/obj/structure/cannon/modern/naval/attack_hand(var/mob/user)
if (ishuman(user) && (map.ID == MAP_CAMPAIGN || map.ID == MAP_BATTLE_SHIPS))
Expand Down
3 changes: 2 additions & 1 deletion code/modules/1713/siege/piece.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@

var/degree = 270
var/distance = 5
var/has_scope = TRUE
var/scope_mod = "Disabled"
var/target_x = 0
var/target_y = -5
Expand Down Expand Up @@ -885,7 +886,7 @@
Shell: <a href='?src=\ref[src];load=1'>[loaded.len ? loaded[1].name : (autoloader ? "Click here to load shell" : "No shell loaded")]</a>[see_amount_loaded ? (loaded.len ? " <b>There are [loaded.len] [loaded[1].name]s loaded.</b>" : " <b>There is nothing loaded.</b>") : ""]<br><br>
Increase/Decrease <b>distance</b>: <a href='?src=\ref[src];distance_1minus=1'>-1</a> | <a href='?src=\ref[src];set_distance=1'>[distance] meters</a> | <a href='?src=\ref[src];distance_1plus=1'>+1</a><br><br>
Increase/Decrease <b>azimuth</b>: <a href='?src=\ref[src];degree_10plus=10'>+10</a> | <a href='?src=\ref[src];degree_1plus=1'>+1</a> | <a href='?src=\ref[src];set_degree=1'>[azimuth] degrees</a> | <a href='?src=\ref[src];degree_1minus=1'>-1</a> | <a href='?src=\ref[src];degree_10minus=1'>-10</a><br><br>
Scope: <a href='?src=\ref[src];toggle_scope=1'>[scope_mod]</a><br><br>
Scope: [has_scope ? ("<a href='?src=\ref[src];toggle_scope=1'>[scope_mod]</a>") : "This weapon has no scope" ] <br><br>
<br>
<center>
<a href='?src=\ref[src];fire=1'><b><big>FIRE!</big></b></a>
Expand Down

0 comments on commit 4460e8f

Please sign in to comment.