Skip to content

Commit

Permalink
Nerfs criticism
Browse files Browse the repository at this point in the history
  • Loading branch information
deathride58 committed Dec 6, 2017
1 parent 8297ca8 commit 3265d09
Show file tree
Hide file tree
Showing 17 changed files with 26 additions and 32 deletions.
3 changes: 0 additions & 3 deletions code/_globalvars/configuration.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,3 @@ GLOBAL_PROTECT(MAX_EX_FLASH_RANGE)
GLOBAL_VAR_INIT(MAX_EX_FLAME_RANGE, 14)
GLOBAL_PROTECT(MAX_EX_FLAME_RANGE)
GLOBAL_VAR_INIT(DYN_EX_SCALE, 0.5)

//Screen resolution stuffs.
GLOBAL_VAR_INIT(DEFAULT_VIEW, "15x15")
3 changes: 3 additions & 0 deletions code/controllers/configuration/entries/config.dm
Original file line number Diff line number Diff line change
Expand Up @@ -385,3 +385,6 @@ CONFIG_TWEAK(flag/ValidateAndSet(str_val))
CONFIG_DEF(number/rounds_until_hard_restart)
value = -1
min_val = 0

CONFIG_DEF(string/default_view)
value = "15x15"
8 changes: 0 additions & 8 deletions code/controllers/configuration/entries/game_options.dm
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,3 @@ CONFIG_DEF(number/emergency_shuttle_autocall_threshold)
integer = FALSE

CONFIG_DEF(flag/ic_printing)

CONFIG_DEF(string/default_view)
value = "15x15"

/datum/config_entry/string/default_view/ValidateAndSet()
. = ..()
if(.)
GLOB.DEFAULT_VIEW = value
2 changes: 1 addition & 1 deletion code/datums/components/riding.dm
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
buckled_mob.pixel_x = 0
buckled_mob.pixel_y = 0
if(buckled_mob.client)
buckled_mob.client.change_view(GLOB.DEFAULT_VIEW)
buckled_mob.client.change_view(CONFIG_GET(string/default_view))

//MOVEMENT
/datum/component/riding/proc/turf_check(turf/next, turf/current)
Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/mecha.dm
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@
setDir(dir_in)

if(L && L.client)
L.client.change_view(GLOB.DEFAULT_VIEW)
L.client.change_view(CONFIG_GET(string/default_view))
zoom_mode = 0

/////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/mecha_actions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
owner.client.change_view(12)
SEND_SOUND(owner, sound('sound/mecha/imag_enh.ogg',volume=50))
else
owner.client.change_view(GLOB.DEFAULT_VIEW) //world.view - default mob view size
owner.client.change_view(CONFIG_GET(string/default_view)) //world.view - default mob view size
UpdateButtonIcon()

/datum/action/innate/mecha/mech_switch_damtype
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/manned_turret.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
buckled_mob.pixel_x = 0
buckled_mob.pixel_y = 0
if(buckled_mob.client)
buckled_mob.client.change_view(GLOB.DEFAULT_VIEW)
buckled_mob.client.change_view(CONFIG_GET(string/default_view))
anchored = FALSE
. = ..()
STOP_PROCESSING(SSfastprocess, src)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/admin/verbs/randomverbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -652,10 +652,10 @@ Traitors and the like can also be revived with the previous role mostly intact.
set name = "Change View Range"
set desc = "switches between 1x and custom views"

if(view == GLOB.DEFAULT_VIEW)
if(view == CONFIG_GET(string/default_view))
change_view(input("Select view range:", "FUCK YE", 7) in list(1,2,3,4,5,6,7,8,9,10,11,12,13,14,128))
else
change_view(GLOB.DEFAULT_VIEW)
change_view(CONFIG_GET(string/default_view))

log_admin("[key_name(usr)] changed their view range to [view].")
//message_admins("\blue [key_name_admin(usr)] changed their view range to [view].") //why? removed by order of XSI
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/spacesuits/flightsuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,7 @@

/obj/item/clothing/head/helmet/space/hardsuit/flightsuit/proc/toggle_zoom(mob/living/user, force_off = FALSE)
if(zoom || force_off)
user.client.change_view(GLOB.DEFAULT_VIEW)
user.client.change_view(CONFIG_GET(string/default_view))
to_chat(user, "<span class='boldnotice'>Disabling smart zooming image enhancement...</span>")
zoom = FALSE
return FALSE
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/dead/observer/observer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(mind.current.key && copytext(mind.current.key,1,2)!="@") //makes sure we don't accidentally kick any clients
to_chat(usr, "<span class='warning'>Another consciousness is in your body...It is resisting you.</span>")
return
client.change_view(GLOB.DEFAULT_VIEW)
client.change_view(CONFIG_GET(string/default_view))
SStgui.on_transfer(src, mind.current) // Transfer NanoUIs.
mind.current.key = key
return 1
Expand Down Expand Up @@ -455,15 +455,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set desc = "Change your view range."

var/max_view = client.prefs.unlock_content ? GHOST_MAX_VIEW_RANGE_MEMBER : GHOST_MAX_VIEW_RANGE_DEFAULT
if(client.view == GLOB.DEFAULT_VIEW)
if(client.view == CONFIG_GET(string/default_view))
var/list/views = list()
for(var/i in 7 to max_view)
views |= i
var/new_view = input("Choose your new view", "Modify view range", 7) as null|anything in views
if(new_view)
client.change_view(Clamp(new_view, 7, max_view))
else
client.change_view(GLOB.DEFAULT_VIEW)
client.change_view(CONFIG_GET(string/default_view))

/mob/dead/observer/verb/add_view_range(input as num)
set name = "Add View Range"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/login.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
if(client)
client.click_intercept = null

client.change_view(GLOB.DEFAULT_VIEW) // Resets the client.view in case it was changed.
client.change_view(CONFIG_GET(string/default_view)) // Resets the client.view in case it was changed.

if(!GLOB.individual_log_list[ckey])
GLOB.individual_log_list[ckey] = logging
Expand Down
2 changes: 1 addition & 1 deletion code/modules/power/singularity/emitter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
buckled_mob.pixel_x = 0
buckled_mob.pixel_y = 0
if(buckled_mob.client)
buckled_mob.client.change_view(GLOB.DEFAULT_VIEW)
buckled_mob.client.change_view(CONFIG_GET(string/default_view))
auto.Remove(buckled_mob)
. = ..()

Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/gun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@
user.client.pixel_x = world.icon_size*_x
user.client.pixel_y = world.icon_size*_y
else
user.client.change_view(GLOB.DEFAULT_VIEW)
user.client.change_view(CONFIG_GET(string/default_view))
user.client.pixel_x = 0
user.client.pixel_y = 0
return zoomed
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/beam_rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
zoom_animating = 0
animate(current_user.client, pixel_x = 0, pixel_y = 0, 0, FALSE, LINEAR_EASING, ANIMATION_END_NOW)
zoom_current_view_increase = 0
current_user.client.change_view(GLOB.DEFAULT_VIEW)
current_user.client.change_view(CONFIG_GET(string/default_view))
zooming_angle = 0
current_zoom_x = 0
current_zoom_y = 0
Expand Down
2 changes: 1 addition & 1 deletion code/modules/shuttle/navigation_computer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj
user.client.images -= the_eye.placement_images
user.client.images -= the_eye.placed_images
user.client.change_view(GLOB.DEFAULT_VIEW)
user.client.change_view(CONFIG_GET(string/default_view))

/obj/machinery/computer/camera_advanced/shuttle_docker/proc/placeLandingSpot()
if(!checkLandingSpot())
Expand Down
7 changes: 7 additions & 0 deletions config/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -396,3 +396,10 @@ DISABLE_HIGH_POP_MC_MODE_AMOUNT 60

## Uncomment to set the number of /world/Reboot()s before the DreamDaemon restarts itself. 0 means restart every round. Requires tgstation server tools.
#ROUNDS_UNTIL_HARD_RESTART 10


##Default screen resolution, in tiles.
## By default, this is 15x15, which gets simplified to 7 by BYOND, as it is a 1:1 screen ratio.
## For reference, Goonstation uses a resolution of 21x15 for it's widescreen mode.
## Do note that changing this value will affect the title screen. The title screen will have to be updated manually if this is changed.
DEFAULT_VIEW 15x15
7 changes: 1 addition & 6 deletions config/game_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -492,9 +492,4 @@ MICE_ROUNDSTART 10
#EMERGENCY_SHUTTLE_AUTOCALL_THRESHOLD 0.2

## Determines if players are allowed to print integrated circuits, uncomment to allow.
#IC_PRINTING

## This sets the default screen resolution, in tiles.
## By default, this is 15x15, which gets simplified to 7 by BYOND, as it is a 1:1 screen ratio.
## For reference, Goonstation uses a resolution of 21x15 for it's widescreen mode.
DEFAULT_VIEW 15x15
#IC_PRINTING

0 comments on commit 3265d09

Please sign in to comment.