Skip to content

Commit

Permalink
Review, I can't believe I put a usr in there awkward
Browse files Browse the repository at this point in the history
  • Loading branch information
morrowwolf committed Aug 29, 2023
1 parent c3f68f9 commit 2a9dcf1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions code/game/gamemodes/cm_initialize.dm
Original file line number Diff line number Diff line change
Expand Up @@ -580,11 +580,11 @@ Additional game mode variables.
var/list/selection_list = list()
var/list/selection_list_structure = list()

if(hive.hive_location && hive.hive_location.lesser_drone_spawns >= 1)
if(hive.hive_location?.lesser_drone_spawns >= 1)
selection_list += "hive core"
selection_list_structure += hive.hive_location

for(var/obj/effect/alien/resin/special/pylon/cycled_pylon in hive.hive_structures[XENO_STRUCTURE_PYLON])
for(var/obj/effect/alien/resin/special/pylon/cycled_pylon as anything in hive.hive_structures[XENO_STRUCTURE_PYLON])
if(cycled_pylon.lesser_drone_spawns >= 1)
selection_list += "[cycled_pylon.name] at [get_area(cycled_pylon)]"
selection_list_structure += cycled_pylon
Expand All @@ -593,7 +593,7 @@ Additional game mode variables.
to_chat(xeno_candidate, SPAN_WARNING("The selected hive does not have enough power for a lesser drone at any hive core or pylon!"))
return FALSE

var/prompt = tgui_input_list(usr, "Select spawn?", "Spawnpoint Selection", selection_list)
var/prompt = tgui_input_list(xeno_candidate, "Select spawn?", "Spawnpoint Selection", selection_list)
if(!prompt)
return FALSE

Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_aliens/structures/special/pylon_core.dm
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
if(!linked_hive.can_spawn_as_lesser_drone(xeno_candidate))
return FALSE

var/mob/living/carbon/xenomorph/lesser_drone/new_drone = new /mob/living/carbon/xenomorph/lesser_drone(loc, null, linked_hive.hivenumber)
var/mob/living/carbon/xenomorph/lesser_drone/new_drone = new(loc, null, linked_hive.hivenumber)
xeno_candidate.mind.transfer_to(new_drone, TRUE)
lesser_drone_spawns -= 1
new_drone.visible_message(SPAN_XENODANGER("A lesser drone emerges out of [src]!"), SPAN_XENODANGER("You emerge out of [src] and awaken from your slumber. For the Hive!"))
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@

/datum/hive_status/proc/update_hugger_limit()
var/iterator = 0
for(var/mob/living/carbon/xenomorph/cycled_xeno in totalXenos)
for(var/mob/living/carbon/xenomorph/cycled_xeno as anything in totalXenos)
if(cycled_xeno.counts_for_slots)
iterator++
if(iterator >= 4)
Expand Down Expand Up @@ -1097,7 +1097,7 @@

/datum/hive_status/proc/update_lesser_drone_limit()
var/iterator = 0
for(var/mob/living/carbon/xenomorph/cycled_xeno in totalXenos)
for(var/mob/living/carbon/xenomorph/cycled_xeno as anything in totalXenos)
if(cycled_xeno.counts_for_slots)
iterator++
if(iterator >= 3)
Expand Down

0 comments on commit 2a9dcf1

Please sign in to comment.