Fix Ash Walkers mining and antag selection, fix Lavaland Syndicate base incinerator buttons and comms agent mask

This commit is contained in:
Mark van Alphen
2019-06-02 01:18:18 +02:00
parent 95fc8773ae
commit 81c325262d
9 changed files with 29 additions and 16 deletions
+1 -1
View File
@@ -29,7 +29,7 @@ client/proc/one_click_antag()
// You pass in ROLE define (optional), the applicant, and the gamemode, and it will return true / false depending on whether the applicant qualify for the candidacy in question
if(jobban_isbanned(M, "Syndicate"))
return FALSE
if(M.stat || !M.mind || M.mind.special_role)
if(M.stat || !M.mind || M.mind.special_role || M.mind.offstation_role)
return FALSE
if(temp)
if((M.mind.assigned_role in temp.restricted_jobs) || (M.client.prefs.species in temp.protected_species))
+2 -1
View File
@@ -30,7 +30,7 @@
var/assignedrole
var/banType = ROLE_GHOST
var/ghost_usable = TRUE
var/offstation_role = TRUE // If set to true, the role of the user's mind will be set to offstation
/obj/effect/mob_spawn/attack_ghost(mob/user)
var/mob/dead/observer/O = user
@@ -111,6 +111,7 @@
MM.objectives += new/datum/objective(objective)
if(assignedrole)
M.mind.assigned_role = assignedrole
M.mind.offstation_role = offstation_role
special(M, name)
MM.name = M.real_name
if(uses > 0)
@@ -115,7 +115,5 @@
language = "Sinta'unathi"
default_language = "Sinta'unathi"
has_fine_manipulation = FALSE
slowdown = -0.80
species_traits = list(NO_BREATHE, NOGUNS)
+1 -1
View File
@@ -98,7 +98,7 @@
return 0
/mob/living/silicon/IsAdvancedToolUser()
return 1
return TRUE
/mob/living/silicon/bullet_act(var/obj/item/projectile/Proj)
@@ -108,7 +108,7 @@
/mob/living/simple_animal/possessed_object/IsAdvancedToolUser() // So we can shoot guns (Mostly ourselves), among other things.
return 1
return TRUE
/mob/living/simple_animal/possessed_object/get_access() // If we've possessed an ID card we've got access to lots of fun things!
+1 -1
View File
@@ -1068,7 +1068,7 @@ var/list/slot_equipment_priority = list( \
/mob/proc/IsAdvancedToolUser()//This might need a rename but it should replace the can this mob use things check
return 0
return FALSE
/mob/proc/swap_hand()
return
+1 -1
View File
@@ -246,7 +246,7 @@
return
// Clumsy folks can only flush it.
if(user.IsAdvancedToolUser(1))
if(user.IsAdvancedToolUser())
ui_interact(user)
else
flush = !flush
@@ -74,10 +74,10 @@
/datum/outfit/lavaland_syndicate/comms
name = "Lavaland Syndicate Comms Agent"
r_hand = /obj/item/melee/energy/sword/saber
mask = /obj/item/clothing/mask/gas/voice
mask = /obj/item/clothing/mask/chameleon
suit = /obj/item/clothing/suit/armor/vest
/obj/item/clothing/mask/gas/voice/gps/New()
/obj/item/clothing/mask/chameleon/gps/New()
. = ..()
new /obj/item/gps/internal/lavaland_syndicate_base(src)