Fixes some issues related to the pra away mission (#7488)

-fixes the commissar role not working properly, making some ghost roles check more robust
-fixes a couple of mapping errors on that space ruin
-fixes the nuclear launcher magazine not accepting the proper bullets
-fixes the cosmonaut suit not accepting tanks on the suit storage slot
This commit is contained in:
Alberyk
2019-11-23 06:10:29 -03:00
committed by Erki
parent b84b82f08d
commit a9d4e6ba5d
7 changed files with 37 additions and 21 deletions

View File

@@ -52,7 +52,7 @@
icon_state = "cosmo_suit"
item_state = "cosmo_suit"
armor = list(melee = 50, bullet = 50, laser = 30, energy = 15, bomb = 40, bio = 100, rad = 60)
allowed = list(/obj/item/device/flashlight,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
allowed = list(/obj/item/tank,/obj/item/device/flashlight,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs)
species_restricted = list("Tajara")
refittable = FALSE
description_fluff = "The People's Republic of Adhomai enjoys having the only militarized spaceships of all the factions on Adhomai. Initially they relied on contracting outside \

View File

@@ -46,22 +46,23 @@
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"
if(req_species_whitelist)
if(!is_alien_whitelisted(user, req_species_whitelist))
return "Missing Species Whitelist"
return FALSE
//Return a error message if the user CANT spawn. Otherwise FALSE
/datum/ghostspawner/proc/cant_spawn(mob/user) //If the user can spawn using the spawner
if(!ROUND_IS_STARTED)
return "The round is not started yet."
var/cant_see = cant_see()
var/cant_see = cant_see(user)
if(cant_see) //If we cant see it, we cant spawn it
return cant_see
if(!istype(user, /mob/abstract/observer))

View File

@@ -8,6 +8,7 @@
spawnpoints = list("pra_cosmonaut")
req_perms = null
max_count = 3
uses_species_whitelist = FALSE
outfit = /datum/outfit/admin/pra_cosmonaut
possible_species = list("Tajara", "M'sai Tajara", "Zhan-Khazan Tajara")
@@ -18,6 +19,7 @@
special_role = "Kosmostrelki"
respawn_flag = null
extra_languages = list(LANGUAGE_SIIK_MAAS)
uses_species_whitelist = FALSE
/datum/ghostspawner/human/pra_cosmonaut/commissar
short_name = "pra_commissar"
@@ -29,10 +31,9 @@
assigned_role = "Party Commissar"
special_role = "Party Commissar"
req_species_whitelist = "Tajara"
outfit = /datum/outfit/admin/pra_cosmonaut/commissar
possible_species = list("Tajara", "M'sai Tajara")
req_species_whitelist = "Tajara"
/datum/outfit/admin/pra_cosmonaut
name = "Kosmostrelki"

View File

@@ -316,5 +316,6 @@
/obj/item/ammo_casing/nuke
name = "miniaturized nuclear warhead"
icon_state = "nuke"
caliber = "nuke"
desc = "A miniaturized version of a nuclear bomb."
projectile_type = /obj/item/projectile/bullet/nuke