Skip to content

Commit

Permalink
Интек ХУДы теперь работают. К тому же добавил описание АС-предметам.
Browse files Browse the repository at this point in the history
  • Loading branch information
SmiLeYre committed Apr 8, 2024
1 parent 392d60a commit eeed855
Show file tree
Hide file tree
Showing 17 changed files with 163 additions and 44 deletions.
6 changes: 3 additions & 3 deletions code/game/gamemodes/nuclear/nuclear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
back = /obj/item/storage/backpack
ears = /obj/item/radio/headset/inteq/alt
l_pocket = /obj/item/pinpointer/nuke/syndicate
id = /obj/item/card/id/syndicate/inteq
id = /obj/item/card/id/inteq
belt = /obj/item/gun/ballistic/automatic/pistol
backpack_contents = list(/obj/item/storage/box/survival/syndie=1,\
/obj/item/kitchen/knife/combat/survival)
Expand All @@ -138,7 +138,7 @@

/datum/outfit/inteq/leader
name = "InteQ Leader - Basic"
id = /obj/item/card/id/syndicate/inteq/nuke_leader
id = /obj/item/card/id/inteq/nuke_leader
gloves = /obj/item/clothing/gloves/krav_maga/combatglovesplus
r_hand = /obj/item/nuclear_challenge
command_radio = TRUE
Expand Down Expand Up @@ -197,7 +197,7 @@
mask = /obj/item/clothing/mask/gas/sechailer
suit = /obj/item/clothing/suit/space/syndicate/inteq
head = /obj/item/clothing/head/helmet/space/syndicate/inteq
id = /obj/item/card/id/syndicate/inteq
id = /obj/item/card/id/inteq
r_pocket = /obj/item/tank/internals/emergency_oxygen/engi/syndi
internals_slot = ITEM_SLOT_RPOCKET
belt = /obj/item/storage/belt/military/inteq
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/porta_turret/portable_turret.dm
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ DEFINE_BITFIELD(turret_flags, list(
/obj/machinery/porta_turret/syndicate/assess_perp(mob/living/carbon/human/perp)
var/obj/item/card/id/target_card = perp.get_idcard(FALSE)
if(target_card && (ACCESS_SYNDICATE in target_card?.access) && istype(target_card, /obj/item/card/id/syndicate))
if(istype(target_card, /obj/item/card/id/syndicate/inteq) || istype(target_card, /obj/item/card/id/syndicate/inteq/anyone) || istype(target_card, /obj/item/card/id/syndicate/inteq/nuke_leader))
if(istype(target_card, /obj/item/card/id/inteq) || istype(target_card, /obj/item/card/id/inteq/anyone) || istype(target_card, /obj/item/card/id/inteq/nuke_leader))
return 10 //no InteQ allowed!
else
return 0
Expand Down
18 changes: 0 additions & 18 deletions code/game/objects/items/cards_ids.dm
Original file line number Diff line number Diff line change
Expand Up @@ -586,24 +586,6 @@
assignment = "Trader"
access = list(ACCESS_SYNDICATE)

/obj/item/card/id/syndicate/inteq
name = "Mercenary Card"
icon_state = "inteq"
assignment = "Mercenary"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_INTEQ)

/obj/item/card/id/syndicate/inteq/anyone
name = "Vanguard Mercenary Card"
icon_state = "inteq"
assignment = "Vanguard Mercenary"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_INTEQ, ACCESS_INTEQ_LEADER)

/obj/item/card/id/syndicate/inteq/nuke_leader
name = "Nuclear Vanguard Mercenary Card"
icon_state = "inteq"
assignment = "Vanguard Mercenary"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_INTEQ, ACCESS_INTEQ_LEADER)

/obj/item/card/id/captains_spare
name = "captain's spare ID"
desc = "The spare ID of the High Lord himself."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@
return "scrambled"
if (istype(src, /obj/item/card/id/syndicate))
return "syndicate"
if (istype(src, /obj/item/card/id/syndicate/inteq))
if (istype(src, /obj/item/card/id/inteq))
return "inteq"
if (istype(src, /obj/item/card/id/nri))
return "nri"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
default_storage = /obj/item/inteq/uplink/radio
initial_language_holder = /datum/language_holder/synthetic
faction = list(ROLE_INTEQ)
access_card = /obj/item/card/id/syndicate/inteq/anyone
access_card = /obj/item/card/id/inteq/anyone
radio = /obj/item/radio/borg/inteq
laws = \
"1. Слава ИнтеКью! Оперативник ИнтеКью является твоим Мастером. Оперативником ИнтеКью является активировавший тебя Агент.\n"+\
Expand Down
Binary file modified icons/mob/hud.dmi
Binary file not shown.
Binary file modified icons/mob/screen_gen.dmi
Binary file not shown.
Binary file modified icons/obj/grenade.dmi
Binary file not shown.
4 changes: 2 additions & 2 deletions modular_bluemoon/Ren/Code/cloth.dm
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@
path = /obj/item/clothing/underwear/socks/socks_line

///Аутфиты
/obj/item/card/id/syndicate/inteq_fake
/obj/item/card/id/inteq_fake
name = "InteQ Vanguard ID card"
id_type_name = "InteQ ID card"
desc = "An ID straight from the InteQ."
Expand All @@ -577,7 +577,7 @@
head = /obj/item/clothing/head/helmet/swat/inteq
mask = /obj/item/clothing/mask/balaclava/breath/inteq
r_pocket = /obj/item/tank/internals/emergency_oxygen/double
id = /obj/item/card/id/syndicate/inteq_fake
id = /obj/item/card/id/inteq_fake

/obj/effect/mob_spawn/human/corpse/inteq_dead
name = "InteQ Operative"
Expand Down
32 changes: 16 additions & 16 deletions modular_bluemoon/SmiLeY/code/modules/client/loadout/ac_clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,21 @@
name = "AC Beret"
path = /obj/item/clothing/head/beret/sec/ac
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Security"
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Blueshield")
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")

/datum/gear/head/ac_cap
name = "AC Cap"
path = /obj/item/clothing/head/soft/sec/ac
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Security"
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Blueshield")
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")

/datum/gear/head/ac_officercap
name = "AC Officer Cap"
path = /obj/item/clothing/head/warden/ac
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Security"
restricted_desc = "Head of Security, Warden, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Blueshield")

// КОСТЮМЫ //
Expand All @@ -60,7 +60,7 @@
name = "AC Armored Coat"
path = /obj/item/clothing/suit/armor/hos/ac
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Security"
restricted_desc = "Head of Security, Warden, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Blueshield")

// УНИФОРМА //
Expand Down Expand Up @@ -100,33 +100,33 @@
name = "AC Tanktop Uniform"
path = /obj/item/clothing/under/rank/security/officer/ac
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Security"
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Blueshield")
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")

/datum/gear/uniform/ac_combatuni
name = "AC Combat Uniform"
path = /obj/item/clothing/under/rank/security/officer/ac/ac_combatuni
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Security"
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Blueshield")
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")

/datum/gear/uniform/ac_combatski
name = "AC Combat Skirt"
path = /obj/item/clothing/under/rank/security/officer/ac/ac_combatski
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Security"
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Blueshield")
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")

/datum/gear/uniform/ac_cassuit
name = "AC Casual Uniform"
path = /obj/item/clothing/under/rank/security/officer/ac/ac_cassuit
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Security"
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Blueshield")
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")

/datum/gear/uniform/ac_casski
name = "AC Casual Skirt"
path = /obj/item/clothing/under/rank/security/officer/ac/ac_casski
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_desc = "Security"
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Blueshield")
restricted_desc = "Head of Security, Warden, Detective, Security Officer, Brig Physician, Peacekeeper, Blueshield."
restricted_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Blueshield")
120 changes: 120 additions & 0 deletions modular_bluemoon/SmiLeY/hecu/icons/inteq_cards.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
/obj/item/card/id/inteq/one_access_copy
name = "Civilian Mercenary Card"
uses = 1

/obj/item/card/id/inteq
name = "Mercenary Card"
icon_state = "inteq"
assignment = "Mercenary"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_INTEQ)

/obj/item/card/id/inteq/anyone
name = "Vanguard Mercenary Card"
icon_state = "inteq"
assignment = "Vanguard Mercenary"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_INTEQ, ACCESS_INTEQ_LEADER)

/obj/item/card/id/inteq/nuke_leader
name = "Nuclear Vanguard Mercenary Card"
icon_state = "inteq"
assignment = "Vanguard Mercenary"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_INTEQ, ACCESS_INTEQ_LEADER)

/obj/item/card/id/inteq
name = "Agent Card"
icon_state = "inteq"
assignment = "Mercenary"
access = list(ACCESS_MAINT_TUNNELS, ACCESS_INTEQ)
var/anyone = FALSE //Can anyone forge the ID or just InteQ?
var/forged = FALSE //have we set a custom name and job assignment, or will we use what we're given when we chameleon change?
var/uses = 10 // Даём гражданской Синди-Карте одно использование вместо десяти.

/obj/item/card/id/inteq/advanced
name = "Agent Card"
icon_state = "card_black"

/obj/item/card/id/inteq/Initialize(mapload)
. = ..()
var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/card/id
chameleon_action.chameleon_name = "ID Card"
chameleon_action.initialize_disguises()
if(!anyone)
AddComponent(/datum/component/identification/syndicate, ID_COMPONENT_DEL_ON_IDENTIFY, ID_COMPONENT_EFFECT_NO_ACTIONS, NONE) //no deconstructive analyzer usage.

/obj/item/card/id/inteq/afterattack(obj/item/O, mob/user, proximity)
if(!proximity)
return
if(istype(O, /obj/item/card/id) && !uses)
to_chat(usr, "<span class='notice'>Микросканеры устройства издают отрицательное жужжание при попытке использовать их ещё раз.</span>")
playsound(src, 'sound/effects/light_flicker.ogg', 100, 1)
return
if(istype(O, /obj/item/card/id))
var/obj/item/card/id/I = O
src.access |= I.access
uses = max(uses - 1, 0)
to_chat(usr, "<span class='notice'>Микросканеры устройства активизируются при проведении ею по Идентификационной Карте и копируют её доступ.</span>")
playsound(src, 'sound/effects/light_flicker.ogg', 100, 1)

/obj/item/card/id/inteq/attack_self(mob/user)
if(isliving(user) && user.mind)
var/first_use = registered_name ? FALSE : TRUE
if(!(user.mind.special_role || anyone)) //Unless anyone is allowed, only syndies can use the card, to stop metagaming.
if(first_use) //If a non-syndie is the first to forge an unassigned agent ID, then anyone can forge it.
anyone = TRUE
else
return ..()

var/popup_input
if(bank_support == ID_FREE_BANK_ACCOUNT)
popup_input = alert(user, "Choose Action", "Agent ID", "Show", "Forge/Reset", "Change Account ID")
else
popup_input = alert(user, "Choose Action", "Agent ID", "Show", "Forge/Reset")
if(!user.canUseTopic(src, BE_CLOSE, FALSE))
return
if(popup_input == "Forge/Reset" && !forged)
var/input_name = stripped_input(user, "What name would you like to put on this card? Leave blank to randomise.", "Agent card name", registered_name ? registered_name : (ishuman(user) ? user.real_name : user.name), MAX_NAME_LEN)
input_name = reject_bad_name(input_name)
if(!input_name)
// Invalid/blank names give a randomly generated one.
if(user.gender == MALE)
input_name = "[pick(GLOB.first_names_male)] [pick(GLOB.last_names)]"
else if(user.gender == FEMALE)
input_name = "[pick(GLOB.first_names_female)] [pick(GLOB.last_names)]"
else
input_name = "[pick(GLOB.first_names)] [pick(GLOB.last_names)]"

var/target_occupation = stripped_input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", assignment ? assignment : "Assistant", MAX_MESSAGE_LEN)
if(!target_occupation)
return
registered_name = input_name
assignment = target_occupation
update_label()
forged = TRUE
to_chat(user, "<span class='notice'>You successfully forge the ID card.</span>")
log_game("[key_name(user)] has forged \the [initial(name)] with name \"[registered_name]\" and occupation \"[assignment]\".")

// First time use automatically sets the account id to the user.
if (first_use && !registered_account)
if(ishuman(user))
var/mob/living/carbon/human/accountowner = user

for(var/bank_account in SSeconomy.bank_accounts)
var/datum/bank_account/account = bank_account
if(account.account_id == accountowner.account_id)
account.bank_cards += src
registered_account = account
to_chat(user, "<span class='notice'>Your account number has been automatically assigned.</span>")
return
else if (popup_input == "Forge/Reset" && forged)
registered_name = initial(registered_name)
assignment = initial(assignment)
log_game("[key_name(user)] has reset \the [initial(name)] named \"[src]\" to default.")
update_label()
forged = FALSE
to_chat(user, "<span class='notice'>You successfully reset the ID card.</span>")
return
else if (popup_input == "Change Account ID")
set_new_account(user)
return
return ..()
16 changes: 16 additions & 0 deletions modular_bluemoon/code/game/objects/items/plushes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,19 @@
icon_state = "ada"
item_state = "ada"
squeak_override = list('modular_citadel/sound/voice/nya.ogg' = 1)

/obj/item/toy/plush/jay
name = "Jay Plushie"
desc = "Плюшевая игрушка фиолетовой ящерки."
icon = 'modular_bluemoon/icons/obj/toys/plushes.dmi'
icon_state = "jay"
item_state = "jay"
squeak_override = list('modular_citadel/sound/voice/nya.ogg' = 1)

/obj/item/toy/plush/kiirava
name = "Kiirava Plushie"
desc = "Плюшевая игрушка зеленоватой ящерки."
icon = 'modular_bluemoon/icons/obj/toys/plushes.dmi'
icon_state = "kiirava"
item_state = "kiirava"
squeak_override = list('modular_citadel/sound/voice/nya.ogg' = 1)
Binary file modified modular_bluemoon/icons/mob/inhands/items/plushes_lefthand.dmi
Binary file not shown.
Binary file modified modular_bluemoon/icons/mob/inhands/items/plushes_righthand.dmi
Binary file not shown.
Binary file modified modular_bluemoon/icons/obj/toys/plushes.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,15 @@
uniform = /obj/item/clothing/under/inteq
shoes = /obj/item/clothing/shoes/combat
ears = /obj/item/radio/headset/inteq/alt
id = /obj/item/card/id/syndicate/inteq
id = /obj/item/card/id/inteq

var/command_radio = FALSE

give_space_cooler_if_synth = TRUE // BLUEMOON ADD

/datum/outfit/inteq_raider/vanguard
name = "InteQ Vanguard"
id = /obj/item/card/id/syndicate/inteq/anyone
id = /obj/item/card/id/inteq/anyone
suit = /obj/item/clothing/suit/armor/inteq/vanguard
head = /obj/item/clothing/head/HoS/inteq_vanguard
l_pocket = /obj/item/clothing/gloves/krav_maga/combatglovesplus
Expand Down
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4435,6 +4435,7 @@
#include "modular_bluemoon\SmiLeY\code\terror_spiders\widow.dm"
#include "modular_bluemoon\SmiLeY\hecu\code\hecu_helmet.dm"
#include "modular_bluemoon\SmiLeY\hecu\code\hecu_suit.dm"
#include "modular_bluemoon\SmiLeY\hecu\icons\inteq_cards.dm"
#include "modular_bluemoon\SmiLeY\inteq_ghostrole\cybersun_tech.dm"
#include "modular_bluemoon\SmiLeY\inteq_ghostrole\forgottenship.dm"
#include "modular_bluemoon\SmiLeY\mapping\access_helpers.dm"
Expand Down

0 comments on commit eeed855

Please sign in to comment.