Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flag of your choice a simple change. #8132

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Flag of your choice a simple change. #8132

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ee8945
a test change
Catzonwheelz Jan 16, 2025
0801791
this should work as steping stone to change the flag
Catzonwheelz Jan 16, 2025
0b91df2
IT works for now time to clean it up
Catzonwheelz Jan 16, 2025
f7cedd8
made the USCM colors the defalt
Catzonwheelz Jan 16, 2025
f2d118e
Merge branch 'master' into Flag-of-your-choice
Catzonwheelz Jan 17, 2025
3c5dd7f
As per ihatethisengine i changed it to not be relative
Catzonwheelz Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions code/modules/defenses/planted_flag.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
var/buff_intensity = PLANTED_FLAG_BUFF
health = 200
health_max = 200
var/alternative_icon = 'icons/obj/structures/machinery/defenses/planted_flag_pride.dmi'

can_be_near_defense = TRUE

Expand All @@ -23,6 +24,12 @@
SENTRY_CATEGORY_IFF = FACTION_MARINE,
)

proc/toggle_icon()

Check warning on line 27 in code/modules/defenses/planted_flag.dm

View workflow job for this annotation

GitHub Actions / Run Linters 

relatively pathed proc defined here
Catzonwheelz marked this conversation as resolved.
Show resolved Hide resolved
if(icon == 'icons/obj/structures/machinery/defenses/planted_flag.dmi')
icon = alternative_icon
else
icon = 'icons/obj/structures/machinery/defenses/planted_flag.dmi'
update_icon()

/obj/structure/machinery/defenses/planted_flag/Initialize()
. = ..()
Expand Down Expand Up @@ -91,6 +98,12 @@
H.activate_order_buff(COMMAND_ORDER_HOLD, buff_intensity, 1.5 SECONDS)
H.activate_order_buff(COMMAND_ORDER_FOCUS, buff_intensity, 1.5 SECONDS)

/obj/structure/machinery/defenses/planted_flag/attackby(obj/item/W, mob/user)
if (HAS_TRAIT(W, TRAIT_TOOL_WIRECUTTERS))
toggle_icon()
return TRUE
return ..()

/obj/structure/machinery/defenses/planted_flag/range
name = "extended JIMA planted flag"
health = 150
Expand Down
Binary file added icons/obj/structures/machinery/defenses/planted_flag_pride.dmi
View file
Open in desktop
Binary file not shown.
Loading