Skip to content

Commit

Permalink
Fix Facehugger Ban Oversight (#3766)
Browse files Browse the repository at this point in the history
# About the pull request

This PR fixes an oversight where the xeno ban check wasn't being done
for facehuggers (except the facehugger join verb).

# Explain why it's good for the game

Fixes #3739 

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/cmss13-devs/cmss13/assets/76988376/861eed98-0810-40ed-8a4c-22529cdac345)

</details>

# Changelog
:cl: Drathek
fix: Fixed missing xeno ban check for playing as a facehugger
/:cl:
  • Loading branch information
Drulikar committed Jun 30, 2023
1 parent 49fc0de commit 9b123cc
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions code/modules/mob/living/carbon/xenomorph/xeno_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
var/bonus_larva_spawn_chance = 1
var/hijack_burrowed_surge = FALSE //at hijack, start spawning lots of burrowed
/// how many burrowed is going to spawn during larva surge
var/hijack_burrowed_left = 0
var/hijack_burrowed_left = 0

var/ignore_slots = FALSE
var/dynamic_evolution = TRUE
Expand Down Expand Up @@ -1006,7 +1006,10 @@

/datum/hive_status/proc/can_spawn_as_hugger(mob/dead/observer/user)
if(!GLOB.hive_datum || ! GLOB.hive_datum[hivenumber])
return
return FALSE
if(jobban_isbanned(user, JOB_XENOMORPH)) // User is jobbanned
to_chat(user, SPAN_WARNING("You are banned from playing aliens and cannot spawn as a xenomorph."))
return FALSE
if(world.time < hugger_timelock)
to_chat(user, SPAN_WARNING("The hive cannot support facehuggers yet..."))
return FALSE
Expand Down

0 comments on commit 9b123cc

Please sign in to comment.