Skip to content

[Code Cleanup] from #11168 #12161

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

Open
Venuska1117 wants to merge 2 commits into
base: master
Choose a base branch
from
+931 −931
Open

[Code Cleanup] from #11168 #12161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2447d1
Hivelord sorting cleanup
Apr 29, 2026
640dffc
Merge branch 'master' into cleanup-designer
Venuska1117 May 5, 2026
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
28 changes: 28 additions & 0 deletions code/modules/cm_aliens/weeds.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,4 +676,32 @@
/obj/effect/resin_construct/transparent/weak
icon_state = "WeakTransparentConstruct"

/obj/effect/resin_construct/fastweak
icon_state = "WeakReflectiveFast"

/obj/effect/resin_construct/speed_node
icon_state = "speednode"

/obj/effect/resin_construct/cost_node
icon_state = "costnode"

/obj/effect/resin_construct/construct_node
icon_state = "constructnode"

/obj/effect/resin_construct/construct_doorslow
icon_state = "BoundDoorSlow"

/obj/effect/resin_construct/construct_wallslow
icon_state = "BoundWallSlow"

/obj/effect/resin_construct/thickfast
icon_state = "ThickConstructFast"

/obj/effect/resin_construct/thickdoorfast
icon_state = "ThickDoorConstructFast"
layer = FIREDOOR_CLOSED_LAYER

/obj/effect/resin_construct/transparent/thickfast
icon_state = "WeakTransparentConstructFast"

#undef WEED_BASE_GROW_SPEED
28 changes: 28 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/abilities/hivelord/hivelord_macros.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/datum/action/xeno_action/verb/verb_change_design()
set category = "Alien"
set name = "Change Design Mark"
set hidden = TRUE
var/action_name = "Change Design Mark"
handle_xeno_macro(src, action_name)

/datum/action/xeno_action/verb/place_design()
set category = "Alien"
set name = "Place Design"
set hidden = TRUE
var/action_name = "Place Design"
handle_xeno_macro(src, action_name)

/datum/action/xeno_action/verb/verb_toggle_design_icons()
set category = "Alien"
set name = "Change Design Mark"
set hidden = TRUE
var/action_name = "Change Design Mark"
handle_xeno_macro(src, action_name)

/datum/action/xeno_action/verb/verb_greater_surge()
set category = "Alien"
set name = "Greater Resin Surge"
set hidden = TRUE
var/action_name = "Greater Resin Surge"
handle_xeno_macro(src, action_name)

Loading
Loading