Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

M2C vision nerf #5104

Closed
wants to merge 1 commit into from
Closed

M2C vision nerf #5104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 4 additions & 21 deletions code/modules/cm_marines/m2c.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
var/anti_cadehugger_range = 1
var/broken_gun = FALSE
var/field_recovery = 130
health = 230
health = 200

/obj/item/device/m2c_gun/Initialize()
. = ..()
Expand Down Expand Up @@ -172,7 +172,7 @@
user.visible_message(SPAN_NOTICE("[user] field recovers \the [src], restoring it back to its original state."), \
SPAN_NOTICE("You repair \the [src] back to a functional state."))
broken_gun = FALSE
health = 110
health = 100
update_icon()
return
else
Expand All @@ -193,8 +193,8 @@
var/fold_time = 1.5 SECONDS
var/repair_time = 5 SECONDS
density = TRUE
health = 230
health_max = 230
health = 200
health_max = 200
display_ammo = FALSE
var/list/cadeblockers = list()
var/cadeblockers_range = 1
Expand Down Expand Up @@ -530,34 +530,17 @@
if(mounting)
var/diff_x = 0
var/diff_y = 0
var/tilesize = 32
var/viewoffset = tilesize * 1

user.reset_view(src)
if(dir == EAST)
diff_x = -16 + user_old_x
user.client.pixel_x = viewoffset
user.client.pixel_y = 0
if(dir == WEST)
diff_x = 16 + user_old_x
user.client.pixel_x = -viewoffset
user.client.pixel_y = 0
if(dir == NORTH)
diff_y = -16 + user_old_y
user.client.pixel_x = 0
user.client.pixel_y = viewoffset
if(dir == SOUTH)
diff_y = 16 + user_old_y
user.client.pixel_x = 0
user.client.pixel_y = -viewoffset

animate(user, pixel_x=diff_x, pixel_y=diff_y, 0.4 SECONDS)
else
if(user.client)
user.client.change_view(GLOB.world_view_size)
user.client.pixel_x = 0
user.client.pixel_y = 0

animate(user, pixel_x=user_old_x, pixel_y=user_old_y, 4, 1)


Expand Down
Loading