mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-22 16:12:19 +00:00
Some ghostspawner fixes (#7403)
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
var/mob_name_pick_message = "Pick a name."
|
||||
var/mob_name_prefix = null //The prefix that should be applied to the mob (i.e. CCIAA, Tpr., Cmdr.)
|
||||
var/mob_name_suffix = null //The suffix that should be applied to the mob name
|
||||
|
||||
|
||||
/datum/ghostspawner/New()
|
||||
. = ..()
|
||||
if(!jobban_job)
|
||||
@@ -45,13 +45,13 @@
|
||||
|
||||
if(req_head_whitelist && !check_whitelist(user))
|
||||
return "Missing Head of Staff Whitelist"
|
||||
|
||||
|
||||
if(req_species_whitelist && !is_alien_whitelisted(user, req_species_whitelist))
|
||||
return "Missing Species Whitelist"
|
||||
|
||||
if(jobban_job && jobban_isbanned(user,jobban_job))
|
||||
return "Job Banned"
|
||||
|
||||
|
||||
if(!enabled && !can_edit(user)) //If its not enabled and the user cant edit it, dont show it
|
||||
return "Currently Disabled"
|
||||
|
||||
@@ -83,10 +83,10 @@
|
||||
return FALSE
|
||||
|
||||
//Proc executed before someone is spawned in
|
||||
/datum/ghostspawner/proc/pre_spawn(mob/user)
|
||||
/datum/ghostspawner/proc/pre_spawn(mob/user)
|
||||
count++ //Increment the spawned in mob count
|
||||
if(max_count && count >= max_count)
|
||||
disable()
|
||||
enabled = FALSE
|
||||
return TRUE
|
||||
|
||||
//This proc selects the spawnpoint to use.
|
||||
@@ -114,6 +114,8 @@
|
||||
|
||||
//Proc executed after someone is spawned in
|
||||
/datum/ghostspawner/proc/post_spawn(mob/user)
|
||||
if(max_count && count >= max_count)
|
||||
disable()
|
||||
if(welcome_message)
|
||||
to_chat(user, span("notice", welcome_message))
|
||||
return TRUE
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
var/picked_species = input(user,"Select your species") as null|anything in species_selection
|
||||
if(!picked_species)
|
||||
picked_species = "Human"
|
||||
picked_species = possible_species[1]
|
||||
|
||||
//Get the name / age from them first
|
||||
var/mname = get_mob_name(user, picked_species)
|
||||
|
||||
41
html/changelogs/191113-bugfix_ghostspawners.yml
Normal file
41
html/changelogs/191113-bugfix_ghostspawners.yml
Normal file
@@ -0,0 +1,41 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
# balance
|
||||
# admin
|
||||
# backend
|
||||
# security
|
||||
# refactor
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: Ferner
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- bugfix: "Fixed an issue with single slot ghost spawners being disabled preemptively. Made the Kataphracts truly unathi exclusive."
|
||||
Reference in New Issue
Block a user