cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-30 12:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into final_away_maps_additions

Browse Source 
# Conflicts:
#	code/__defines/misc.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
#	icons/mob/head.dmi
#	maps/exodus/code/exodus.dm
This commit is contained in:
alberyk
2022-04-04 19:47:58 -03:00
parent 61118d6774 b44b124575
commit 8c1d2a7cde
100 changed files with 1824 additions and 447407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/client/client defines.dm
View File

@@ -26,6 +26,7 @@
var/adminobs = null
var/area = null
var/time_died_as_rat = 0
var/list/autofire_aiming_at[2]
var/adminhelped = NOT_ADMINHELPED

35
code/modules/client/client procs.dm
View File

@@ -771,6 +771,9 @@ var/list/localhost_addresses = list(
. = ..()
if(over_object)
if(autofire_aiming_at[1])
autofire_aiming_at[1] = over_object
autofire_aiming_at[2] = params
var/mob/living/M = mob
if(istype(get_turf(over_object), /atom))
var/atom/A = get_turf(over_object)
@@ -780,15 +783,35 @@ var/list/localhost_addresses = list(
if(istype(M) && !M.incapacitated())
var/obj/item/I = M.get_active_hand()
if(istype(I, /obj/item/gun))
var/obj/item/gun/gun = I
if(gun.can_autofire())
M.set_dir(get_dir(M, over_object))
gun.Fire(get_turf(over_object), M, params, (get_dist(over_object, M) <= 1), FALSE)
if(istype(I, /obj/item/rfd/mining) && isturf(over_object))
var/proximity = M.Adjacent(over_object)
var/obj/item/rfd/mining/RFDM = I
RFDM.afterattack(over_object, M, proximity, params, FALSE)
CHECK_TICK
/client/MouseDown(object, location, control, params)
var/obj/item/I = mob.get_active_hand()
var/obj/O = object
if(istype(I, /obj/item/gun))
var/obj/item/gun/G = I
if(G.can_autofire(object, location, params) && O.is_auto_clickable())
autofire_aiming_at[1] = object
autofire_aiming_at[2] = params
while(autofire_aiming_at[1])
G.Fire(autofire_aiming_at[1], mob, autofire_aiming_at[2], (get_dist(mob, location) <= 1), FALSE)
mob.set_dir(get_dir(mob, autofire_aiming_at[1]))
sleep(G.fire_delay)
CHECK_TICK
/client/MouseUp(object, location, control, params)
autofire_aiming_at[1] = null
/atom/proc/is_auto_clickable()
return TRUE
/obj/screen/is_auto_clickable()
return FALSE
/obj/screen/click_catcher/is_auto_clickable()
return TRUE

7
code/modules/client/preference_setup/loadout/loadout_augments.dm
View File

@@ -32,6 +32,7 @@
display_name = "synthetic vocal cords"
description = "Vocal cords of synthetic nature packed into an augment kit. This allows users who are mute due to structural damage of the throat to speak."
path = /obj/item/organ/internal/augment/synthetic_cords
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI)
cost = 1
/datum/gear/augment/combitool
@@ -64,6 +65,7 @@
display_name = "cochlear implant"
description = "A synthetic replacement for the structures within the ear, allowing the user to hear without requiring external tools."
path = /obj/item/organ/internal/augment/cochlear
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI)
cost = 3
/datum/gear/augment/health_scanner
@@ -82,6 +84,7 @@
display_name = "taste booster selection"
description = "A selection of augments that modify the user's taste sensitivity."
path = /obj/item/organ/internal/augment/taste_booster
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI)
/datum/gear/augment/taste_boosters/New()
..()
@@ -156,21 +159,25 @@
description = "A fluff based augmentation that can be renamed/redescribed to appear as something else for RP purposes."
path = /obj/item/organ/internal/augment/head_fluff
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI)
/datum/gear/augment/chest_fluff
display_name = "Custom chest augmentation"
description = "A fluff based augmentation that can be renamed/redescribed to appear as something else for RP purposes."
path = /obj/item/organ/internal/augment/head_fluff/chest_fluff
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI)
/datum/gear/augment/rhand_fluff
display_name = "Custom right hand augmentation"
description = "A fluff based augmentation that can be renamed/redescribed to appear as something else for RP purposes."
path = /obj/item/organ/internal/augment/head_fluff/rhand_fluff
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI)
/datum/gear/augment/lhand_fluff
display_name = "Custom left hand augmentation"
description = "A fluff based augmentation that can be renamed/redescribed to appear as something else for RP purposes."
path = /obj/item/organ/internal/augment/head_fluff/lhand_fluff
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_UNATHI)

52
code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
View File

@@ -54,7 +54,7 @@
coat["tajaran naval coat"] = /obj/item/clothing/suit/storage/toggle/tajaran
coat["gruff cloak"] = /obj/item/clothing/suit/storage/hooded/tajaran
coat["adhomian wool coat"] = /obj/item/clothing/suit/storage/toggle/tajaran/wool
coat["Raakti Shariim coat"] = /obj/item/clothing/suit/storage/toggle/tajaran/raakti_shariim
coat["raakti shariim coat"] = /obj/item/clothing/suit/storage/toggle/tajaran/raakti_shariim
gear_tweaks += new /datum/gear_tweak/path(coat)
/datum/gear/suit/tajara_cloak
@@ -86,7 +86,7 @@
robes["sun priest robe"] = /obj/item/clothing/suit/storage/hooded/tajaran/priest
robes["sun sister robe"] = /obj/item/clothing/suit/storage/tajaran/messa
robes["matake priest mantle"] = /obj/item/clothing/suit/storage/tajaran/matake
robes["Azubarre priest robes"] = /obj/item/clothing/suit/storage/tajaran/azubarre
robes["azubarre priest robes"] = /obj/item/clothing/suit/storage/tajaran/azubarre
gear_tweaks += new /datum/gear_tweak/path(robes)
/datum/gear/suit/tajaran_labcoat
@@ -100,7 +100,7 @@
display_name = "adhomian surgeon garb"
path = /obj/item/clothing/suit/storage/hooded/tajaran/surgery
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Xenobiologist")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Xenobiologist", "Roboticist")
sort_category = "Xenowear - Tajara"
/datum/gear/uniform/tajara
@@ -115,12 +115,12 @@
var/list/uniform = list()
uniform["laborers clothes"] = /obj/item/clothing/under/tajaran
uniform["fancy uniform"] = /obj/item/clothing/under/tajaran/fancy
uniform["NanoTrasen overalls"] = /obj/item/clothing/under/tajaran/nt
uniform["nanotrasen overalls"] = /obj/item/clothing/under/tajaran/nt
uniform["matake priest garments"] = /obj/item/clothing/under/tajaran/matake
uniform["adhomian summerwear"] = /obj/item/clothing/under/tajaran/summer
uniform["adhomian summer pants"] = /obj/item/clothing/under/pants/tajaran
uniform["machinist uniform"] = /obj/item/clothing/under/tajaran/mechanic
uniform["Raakti Shariim uniform"] = /obj/item/clothing/under/tajaran/raakti_shariim
uniform["raakti shariim uniform"] = /obj/item/clothing/under/tajaran/raakti_shariim
gear_tweaks += new /datum/gear_tweak/path(uniform)
/datum/gear/uniform/tajara_dress
@@ -197,6 +197,11 @@
circlet["fur hat"] = /obj/item/clothing/head/tajaran/fur
circlet["matake priest hat"] = /obj/item/clothing/head/tajaran/matake
circlet["raakti shariim beret"] = /obj/item/clothing/head/beret/tajaran/raakti_shariim
circlet["hadiist army beret"] = /obj/item/clothing/head/beret/tajaran/pra
circlet["liberation army beret"] = /obj/item/clothing/head/beret/tajaran/dpra
circlet["liberation army beret, alternative"] = /obj/item/clothing/head/beret/tajaran/dpra/alt
circlet["new kingdom naval beret"] = /obj/item/clothing/head/beret/tajaran/nka
circlet["new kingdom naval officer beret"] = /obj/item/clothing/head/beret/tajaran/nka/officer
gear_tweaks += new /datum/gear_tweak/path(circlet)
/datum/gear/accessory/tajara_wrap
@@ -252,7 +257,7 @@
sort_category = "Xenowear - Tajara"
/datum/gear/accessory/tajaran_card
display_name = "tajaran cards, badges and pins selection"
display_name = "tajaran faction cards, badges and pins selection"
description = "A selection of Tajaran related cards, badges and pins."
path = /obj/item/clothing/accessory/badge/hadii_card
sort_category = "Xenowear - Tajara"
@@ -329,7 +334,7 @@
path = /obj/item/voidsuit_modkit/himeo/tajara
sort_category = "Xenowear - Tajara"
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
allowed_roles = list("Shaft Miner", "Operations Manager", "Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
allowed_roles = list("Cargo Technician", "Shaft Miner", "Quartermaster", "Head of Personnel", "Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
/datum/gear/tajaran_tarot
display_name = "adhomian divination cards deck"
@@ -358,3 +363,36 @@
charm["tajani charm"] = /obj/item/clothing/accessory/tajaran/charm/tajani
charm["holy sun rosette"] = /obj/item/clothing/accessory/tajaran/srendarr
gear_tweaks += new /datum/gear_tweak/path(charm)
/datum/gear/accessory/dpra_party_pin
display_name = "democratic peoples republic party pins selection"
description = "A selection of DPRA party pins."
path = /obj/item/clothing/accessory/tajaran/nawparty_pin
sort_category = "Xenowear - Tajara"
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/accessory/dpra_party_pin/New()
..()
var/list/card = list()
card["national adhomai workers party pin"] = /obj/item/clothing/accessory/tajaran/nawparty_pin
card["free tajaran people party pin"] = /obj/item/clothing/accessory/tajaran/ftpparty_pin
card["followers of Nated party pin"] = /obj/item/clothing/accessory/tajaran/fonparty_pin
card["adhomian blue party pin"] = /obj/item/clothing/accessory/tajaran/abparty_pin
card["amohdan free lodge party pin"] = /obj/item/clothing/accessory/tajaran/aflparty_pin
gear_tweaks += new /datum/gear_tweak/path(card)
/datum/gear/accessory/tajaran_gen_accessorry
display_name = "tajaran accessories selection"
description = "A selection of tajaran related accessories."
path = /obj/item/clothing/accessory/tajaran/zbrojny_badge
sort_category = "Xenowear - Tajara"
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/accessory/tajaran_gen_accessorry/New()
..()
var/list/card = list()
card["zbrojny badge"] = /obj/item/clothing/accessory/tajaran/zbrojny_badge
card["golden sun pin"] = /obj/item/clothing/accessory/tajaran/tanker_pin
gear_tweaks += new /datum/gear_tweak/path(card)