Skip to content

Commit

Permalink
ХУЙ В МОЕЙ ЖОПЕ УАЭАЭА
Browse files Browse the repository at this point in the history
  • Loading branch information
Krashly committed Oct 15, 2024
1 parent fe13f11 commit 92c1ceb
Showing 16 changed files with 77 additions and 119 deletions.
2 changes: 1 addition & 1 deletion code/__DEFINES/access.dm
Original file line number Diff line number Diff line change
@@ -529,7 +529,7 @@
ACCESS_VAULT, \
)
/// Name for the Centcom region.
#define REGION_CENTCOM "SolFed Government" // ARK STATION EDIT || Central Command
#define REGION_CENTCOM "Central Command"
/// Used to seed the accesses_by_region list in SSid_access. A list of all CENTCOM_ACCESS regional accesses.
#define REGION_ACCESS_CENTCOM CENTCOM_ACCESS

2 changes: 1 addition & 1 deletion code/__DEFINES/jobs.dm
Original file line number Diff line number Diff line change
@@ -126,7 +126,7 @@
#define JOB_CENTCOM_SPECIAL_OFFICER "Special Ops Officer"
#define JOB_CENTCOM_PRIVATE_SECURITY "Private Security Force"
// NOVA EDIT ADDITION START
#define JOB_BLUESHIELD "Admiral's Shield" // ARK STATION EDIT || Blueshield
#define JOB_BLUESHIELD "Admirals Shield" // ARK STATION EDIT || Blueshield
#define JOB_NT_REP "Consul of the Solar Federation" // ARK STATION EDIT || Nanotrasen Consultant
// Nanotrasen Naval Command jobs
#define JOB_NAVAL_ENSIGN "Ensign"
2 changes: 1 addition & 1 deletion code/__HELPERS/names.dm
Original file line number Diff line number Diff line change
@@ -76,7 +76,7 @@ GLOBAL_VAR(command_name)
if (GLOB.command_name)
return GLOB.command_name

var/name = "SolFed Government" // ARK STATION EDIT || Central Command
var/name = "Central Command"

GLOB.command_name = name
return name
6 changes: 3 additions & 3 deletions code/__HELPERS/~~ark_helpers/matrices.dm
Original file line number Diff line number Diff line change
@@ -72,12 +72,12 @@
if(isnum(text2num(num1)))
num1 = text2num(num1)
else
num1 = text2ascii(lowertext(num1)) - 87
num1 = text2ascii(LOWER_TEXT(num1)) - 87

if(isnum(text2num(num1)))
num2 = text2num(num1)
else
num2 = text2ascii(lowertext(num2)) - 87
num2 = text2ascii(LOWER_TEXT(num2)) - 87

return num1 * 16 + num2

@@ -97,7 +97,7 @@
SetBrightness(brightness)

/datum/ColorMatrix/proc/SetPreset(preset)
switch(lowertext(preset))
switch(LOWER_TEXT(preset))
if("invert")
matrix = list(-1,0,0,
0,-1,0,
14 changes: 0 additions & 14 deletions code/game/atom/_atom.dm
Original file line number Diff line number Diff line change
@@ -141,20 +141,6 @@
/// Flags to check for in can_perform_action for mouse drag & drop checks. To bypass checks see interaction_flags_atom mouse drop flags
var/interaction_flags_mouse_drop = NONE

// ARK STATION ADDITION START
var/glow_icon = 'modularz_arkstation/modules/light-change/lamps.dmi'
var/exposure_icon = 'modularz_arkstation/modules/light-change/exposures.dmi'

var/glow_icon_state
var/glow_colored = FALSE

var/exposure_icon_state
var/exposure_colored = TRUE

var/image/glow_overlay
var/image/exposure_overlay
// ARK STATION ADDITION END

/**
* Top level of the destroy chain for most atoms
*
2 changes: 0 additions & 2 deletions code/modules/admin/holder2.dm
Original file line number Diff line number Diff line change
@@ -37,8 +37,6 @@ GLOBAL_PROTECT(href_token)
var/datum/plane_master_debug/plane_debug
var/obj/machinery/computer/libraryconsole/admin_only_do_not_map_in_you_fucker/library_manager

var/datum/bloom_edit/debug_bloom // ARK STATION ADDITION

/// Whether or not the user tried to connect, but was blocked by 2FA
var/blocked_by_2fa = FALSE

2 changes: 1 addition & 1 deletion code/modules/escape_menu/subsystem.dm
Original file line number Diff line number Diff line change
@@ -3,4 +3,4 @@ PROCESSING_SUBSYSTEM_DEF(escape_menu)
name = "Escape Menu"
flags = SS_NO_INIT
runlevels = ALL
wait = 200000 SECONDS // ARK STATION EDIT - КОСТЫЛЬ, НО ПОХУЙ.
wait = 2 SECONDS
4 changes: 2 additions & 2 deletions code/modules/jobs/job_types/prisoner.dm
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
department_head = list("The Security Team")
faction = FACTION_STATION
total_positions = 0 // NOVA EDIT: Original value (0) <== ARK STATION EDIT: Nova Sector value (12) <== (0)
spawn_positions = 0 // ARK STATION EDIT
spawn_positions = 0 // ARK STATION EDIT
supervisors = "the security team"
exp_granted_type = EXP_TYPE_CREW
paycheck = PAYCHECK_LOWER
@@ -23,7 +23,7 @@

family_heirlooms = list(/obj/item/pen/blue)
rpg_title = "Defeated Miniboss"
job_flags = STATION_JOB_FLAGS | JOB_CANNOT_OPEN_SLOTS & ~JOB_REOPEN_ON_ROUNDSTART_LOSS || JOB_HIDE_WHEN_EMPTY
job_flags = STATION_JOB_FLAGS | JOB_CANNOT_OPEN_SLOTS & ~JOB_REOPEN_ON_ROUNDSTART_LOSS || JOB_HIDE_WHEN_EMPTY // ARK STATION EDIT

/datum/job/prisoner/New()
. = ..()
3 changes: 1 addition & 2 deletions code/modules/projectiles/projectile.dm
Original file line number Diff line number Diff line change
@@ -5,11 +5,10 @@

/obj/projectile
name = "projectile"
icon = 'modularz_arkstation/_master_files/icons/obj/weapons/guns/projectiles.dmi' // 'icons/obj/weapons/guns/projectiles.dmi' // ARK STATION EDIT
icon = 'icons/obj/weapons/guns/projectiles.dmi'
icon_state = "bullet"
density = FALSE
anchored = TRUE
animate_movement = NO_STEPS // ARK STATION ADDITION
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
movement_type = FLYING
wound_bonus = CANT_WOUND // can't wound by default
6 changes: 0 additions & 6 deletions modular_nova/master_files/code/modules/client/preferences.dm
Original file line number Diff line number Diff line change
@@ -55,12 +55,6 @@
/// If a food doesn't exist in this list, it uses the default value.
var/list/food_preferences = list()

// ARK STATION ADDITION START
// var/bloomlevel = BLOOM_MED
// var/old_lighting = FALSE
// var/lampsglare = TRUE
// ARK STATION ADDITION END

/datum/preferences/proc/species_updated(species_type)
all_quirks = list()
// Reset cultural stuff
42 changes: 25 additions & 17 deletions modular_nova/modules/alternative_job_titles/code/alt_job_titles.dm
Original file line number Diff line number Diff line change
@@ -31,14 +31,14 @@
"Off-Duty Staff",
"Musician",
"Colonist",
"Contractor",
//"Contractor", // ARK STATION REMOVED
)

/datum/job/atmospheric_technician
alt_titles = list(
"Atmospheric Technician",
"Emergency Fire Technician",
"Firefighter",
//"Firefighter", // ARK STATION REMOVED
"Life Support Technician",
)

@@ -73,8 +73,9 @@

/datum/job/blueshield
alt_titles = list(
"Blueshield",
"Command Bodyguard",
"Admirals Shield", // ARK STATION ADDITION
//"Blueshield", // ARK STATION REMOVED
//"Command Bodyguard", // ARK STATION REMOVED
"Executive Protection Agent",
)

@@ -101,22 +102,25 @@
"Doorman",
)

/*
/* // ARK STATION REMOVED START
/datum/job/corrections_officer
alt_titles = list(
"Corrections Officer",
"Brig Officer",
"Prison Guard",
)
*/
*/ // ARK STATION REMOVED END

/datum/job/captain
alt_titles = list(
/* // ARK STATION REMOVED START
"Captain",
"Commanding Officer",
"Site Manager",
"Station Commander",
"Facility Director",
*/ // ARK STATION REMOVED END
"Admiral", // ARK STATION ADDITION
)

/datum/job/cargo_technician
@@ -215,11 +219,13 @@
"Librarian",
)

///datum/job/customs_agent
// alt_titles = list(
// "Customs Agent",
// "Supply Guard",
// )
/* // ARK STATION REMOVED START
/datum/job/customs_agent
alt_titles = list(
"Customs Agent",
"Supply Guard",
)
*/ // ARK STATION REMOVED END

/datum/job/cyborg
alt_titles = list(
@@ -270,7 +276,7 @@
"Chief Constable",
"Chief of Security",
"Security Commander",
"Sheriff",
// "Sheriff", // ARK STATION REMOVED
)

/datum/job/janitor
@@ -310,11 +316,13 @@
"Nanotrasen Diplomat",
)

///datum/job/orderly
// alt_titles = list(
// "Orderly",
// "Medical Guard",
// ) //other dept guards' alt-titles should be kept to [department] guard to avoid confusion, unless the department gets a re-do.
/* // ARK STATION REMOVED START
/datum/job/orderly
alt_titles = list(
"Orderly",
"Medical Guard",
) //other dept guards' alt-titles should be kept to [department] guard to avoid confusion, unless the department gets a re-do.
*/ // ARK STATION REMOVED END

/datum/job/paramedic
alt_titles = list(
Original file line number Diff line number Diff line change
@@ -24,16 +24,16 @@
//
//
// Лампы. К нему подсасываются другие эффекты, а от него уже на update_bloom() по LIGHTING_LAMPS_PLANE
/atom/movable/screen/plane_master/lamps
name = "Lamps Plane Master"
documentation = "Lamps."
plane = LIGHTING_LAMPS_PLANE
appearance_flags = PLANE_MASTER
blend_mode_override = BLEND_OVERLAY
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
render_relay_planes = list(RENDER_PLANE_GAME)
// /atom/movable/screen/plane_master/lamps
// name = "Lamps Plane Master"
// documentation = "Lamps."
// plane = LIGHTING_LAMPS_PLANE
// appearance_flags = PLANE_MASTER
// blend_mode_override = BLEND_OVERLAY
// mouse_opacity = MOUSE_OPACITY_TRANSPARENT
// render_relay_planes = list(RENDER_PLANE_GAME)

render_target = LIGHTING_LAMPS_RENDER_TARGET // ТАРГЕТ ДЛЯ ДРУГИХ ЭФФЕКТОВ. ВСЁ ЭТО КОМПАНУЕТСЯ И СОСЕТСЯ К update_bloom() ПОД LIGHTING_LAMPS_PLANE
// render_target = LIGHTING_LAMPS_RENDER_TARGET // ТАРГЕТ ДЛЯ ДРУГИХ ЭФФЕКТОВ. ВСЁ ЭТО КОМПАНУЕТСЯ И СОСЕТСЯ К update_bloom() ПОД LIGHTING_LAMPS_PLANE

// Блюр на LIGHTING_EXPOSURE_PLANE плейн (Т.е. это сам эффект БЛУМА. Там добавляется оверлей, а эта хуйня его блюрит.)
/atom/movable/screen/plane_master/exposure
@@ -58,18 +58,17 @@
/atom/movable/screen/plane_master/lamps_selfglow
name = "Lamps Selfglow Plane Master"
documentation = "Lamps Selfglow."
plane = LIGHTING_LAMPS_PLANE //LIGHTING_LAMPS_SELFGLOW
plane = LIGHTING_LAMPS_PLANE
appearance_flags = PLANE_MASTER
blend_mode = BLEND_OVERLAY //BLEND_ADD
blend_mode_override = BLEND_OVERLAY //BLEND_ADD
blend_mode = BLEND_ADD //BLEND_OVERLAY
blend_mode_override = BLEND_ADD //BLEND_OVERLAY
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
render_relay_planes = list(RENDER_PLANE_GAME)

/atom/movable/screen/plane_master/lamps_selfglow/show_to(mob/mymob)
. = ..()
if(!.)
return
// remove_filter("add_lamps_to_selfglow")
remove_filter("lamps_selfglow_bloom")

if(istype(mymob) && mymob.canon_client?.prefs?.read_preference(/datum/preference/toggle/bloom_filter))
@@ -88,14 +87,13 @@
bloomsize = 5
bloomoffset = 3

//add_filter("add_lamps_to_selfglow", 1, layering_filter(render_source = LIGHTING_LAMPS_RENDER_TARGET, blend_mode = BLEND_OVERLAY)) // ПО ИДЕЕ ПОДСАСЫВАЕТСЯ НА СВЕТ ОТ update_bloom() от LIGHTING_LAMPS_RENDER_TARGET
add_filter("lamps_selfglow_bloom", 1, bloom_filter(threshold = "#aaaaaa", size = bloomsize, offset = bloomoffset, alpha = 100)) // 100
add_filter("lamps_selfglow_bloom", 1, bloom_filter(threshold = "#aaaaaa", size = bloomsize, offset = bloomoffset, alpha = 100))

// Блики
/atom/movable/screen/plane_master/lamps_glare
name = "Lamps Glare Plane Master"
documentation = "Lamps Glare."
plane = LIGHTING_LAMPS_PLANE //LIGHTING_LAMPS_GLARE
plane = LIGHTING_LAMPS_PLANE
appearance_flags = PLANE_MASTER
blend_mode = BLEND_OVERLAY
blend_mode_override = BLEND_OVERLAY
@@ -106,58 +104,6 @@
. = ..()
if(!.)
return
// remove_filter("add_lamps_to_glare")
remove_filter("lamps_glare")
if(istype(mymob) && mymob.canon_client?.prefs?.read_preference(/datum/preference/toggle/bloom_filter))
//add_filter("add_lamps_to_glare", 1, layering_filter(render_source = LIGHTING_LAMPS_RENDER_TARGET, blend_mode = BLEND_OVERLAY)) // ПО ИДЕЕ ПОДСАСЫВАЕТСЯ НА СВЕТ ОТ update_bloom() от LIGHTING_LAMPS_RENDER_TARGET
add_filter("lamps_glare", 1, radial_blur_filter(size = 0.06)) // 0.05

// ГЛУПЫЕ НАСТРОЙКИ. ВРУБИТЬ ЕСЛИ ОХОТА ПРОСТО ТЫКАТЬ КНОПКУ. //
/*
/client/verb/set_bloom_level()
set name = "LIGHTING: Set Bloom Level"
set category = "OOC"
set desc = "Set bloom level near lamps."
var/new_setting = input(src, "LIGHTING: Bloom Level:") as null|anything in list("Disable", "Low", "Medium (Default)", "High")
if(!new_setting)
return
switch(new_setting)
if("Disable")
prefs.bloomlevel = BLOOM_DISABLE
if("Low")
prefs.bloomlevel = BLOOM_LOW
if("Medium (Default)")
prefs.bloomlevel = BLOOM_MED
if("High")
prefs.bloomlevel = BLOOM_HIGH
to_chat(src, "Bloom: [new_setting].")
prefs.save_preferences()
if(screen && screen.len)
var/atom/movable/screen/plane_master/lamps_selfglow/PM = locate() in screen
PM.show_to(mob)
/client/verb/toggle_oldnew_lighting()
set name = "LIGHTING: Toggle Old/New Lighting"
set category = "OOC"
set desc = "Toggle lighting variant."
prefs.old_lighting = !prefs.old_lighting
to_chat(src, "Lighting: [prefs.old_lighting ? "Old" : "New"].")
prefs.save_preferences()
if(screen && screen.len)
var/atom/movable/screen/plane_master/exposure/EXP = locate() in screen
var/atom/movable/screen/plane_master/lamps_selfglow/BLM = locate() in screen
var/atom/movable/screen/plane_master/lamps_glare/GLR = locate() in screen
if(prefs.old_lighting)
EXP.alpha = 0
else
EXP.alpha = 255
EXP.show_to(mob)
BLM.show_to(mob)
GLR.show_to(mob)
*/
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/obj/projectile
icon = 'modularz_arkstation/_master_files/icons/obj/weapons/guns/projectiles.dmi'
animate_movement = NO_STEPS
13 changes: 13 additions & 0 deletions modularz_arkstation/modules/light-change/code.dm
Original file line number Diff line number Diff line change
@@ -18,6 +18,19 @@
/obj/item/wallframe/light_fixture
icon = 'modularz_arkstation/modules/light-change/lighting.dmi'

/atom
var/glow_icon = 'modularz_arkstation/modules/light-change/lamps.dmi'
var/exposure_icon = 'modularz_arkstation/modules/light-change/exposures.dmi'

var/glow_icon_state
var/glow_colored = FALSE

var/exposure_icon_state
var/exposure_colored = TRUE

var/image/glow_overlay
var/image/exposure_overlay

/obj/machinery/computer
exposure_icon_state = "circle"
glow_icon = 'modularz_arkstation/modules/new-computer-sprites/computer.dmi'
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
@@ -8808,6 +8808,7 @@
#include "modularz_arkstation\modules\aesthetic\new_ingame_icons\grille\grille.dm"
#include "modularz_arkstation\modules\aesthetic\new_ingame_icons\libraryscanner\libraryscanner.dm"
#include "modularz_arkstation\modules\aesthetic\new_ingame_icons\photocopier\photocopier.dm"
#include "modularz_arkstation\modules\aesthetic\new_ingame_icons\projectiles\projectiles.dm"
#include "modularz_arkstation\modules\aesthetic\new_ingame_icons\unary_devices\unary_devices.dm"
#include "modularz_arkstation\modules\akula-skinsuit-fix\code.dm"
#include "modularz_arkstation\modules\alt_job_titles\alt_job_titles.dm"
Loading

0 comments on commit 92c1ceb

Please sign in to comment.