shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

let's make it pretty

Browse Source
This commit is contained in:
kevinz000
2020-05-27 00:08:00 -07:00
parent 88476273fd
commit dc3f02dbfb
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/shields.dm
+4 -4
View File
@@ -24,7 +24,7 @@
var/shieldbash_push_distance = 1 var/shieldbash_push_distance = 1
/datum/block_parry_data/shield /datum/block_parry_data/shield
block_stamina_efficiency = 1 block_stamina_efficiency = 1.5
block_stamina_cost_per_second = 3 block_stamina_cost_per_second = 3
/obj/item/shield/examine(mob/user) /obj/item/shield/examine(mob/user)
@@ -193,7 +193,7 @@
var/repair_material = /obj/item/stack/sheet/mineral/titanium var/repair_material = /obj/item/stack/sheet/mineral/titanium
var/can_shatter = TRUE var/can_shatter = TRUE
shield_flags = SHIELD_FLAGS_DEFAULT | SHIELD_TRANSPARENT shield_flags = SHIELD_FLAGS_DEFAULT | SHIELD_TRANSPARENT
max_integrity = 300 max_integrity = 450
/obj/item/shield/riot/attackby(obj/item/W, mob/user, params) /obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/melee/baton)) if(istype(W, /obj/item/melee/baton))
@@ -246,13 +246,13 @@
lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
shield_flags = SHIELD_FLAGS_DEFAULT shield_flags = SHIELD_FLAGS_DEFAULT
max_integrity = 200 max_integrity = 300
obj/item/shield/riot/bullet_proof obj/item/shield/riot/bullet_proof
name = "bullet resistant shield" name = "bullet resistant shield"
desc = "A far more frail shield made of resistant plastics and kevlar meant to block ballistics." desc = "A far more frail shield made of resistant plastics and kevlar meant to block ballistics."
armor = list("melee" = 30, "bullet" = 80, "laser" = 0, "energy" = 0, "bomb" = -40, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50) armor = list("melee" = 30, "bullet" = 80, "laser" = 0, "energy" = 0, "bomb" = -40, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
max_integrity = 200 max_integrity = 300
/obj/item/shield/riot/roman /obj/item/shield/riot/roman
name = "\improper Roman shield" name = "\improper Roman shield"
code/modules/mob/living/carbon/carbon_movement.dm
+6 -1
View File
@@ -20,7 +20,12 @@
if(istype(J) && (movement_dir || J.stabilizers) && J.allow_thrust(0.01, src)) if(istype(J) && (movement_dir || J.stabilizers) && J.allow_thrust(0.01, src))
return 1 return 1
/mob/living/carbon/Move(NewLoc, direct) /mob/living/carbon/Moved()
wrongdirmovedelay = FALSE
if((combat_flags & COMBAT_FLAG_COMBAT_ACTIVE) && client && lastmousedir)
if(lastmousedir != dir)
wrongdirmovedelay = TRUE
setDir(lastmousedir, ismousemovement = TRUE)
. = ..() . = ..()
if(. && (movement_type & FLOATING)) //floating is easy if(. && (movement_type & FLOATING)) //floating is easy
if(HAS_TRAIT(src, TRAIT_NOHUNGER)) if(HAS_TRAIT(src, TRAIT_NOHUNGER))
code/modules/mob/living/living_movement.dm
+4 -4
View File
@@ -3,12 +3,12 @@
update_turf_movespeed(loc) update_turf_movespeed(loc)
//Hide typing indicator if we move. //Hide typing indicator if we move.
clear_typing_indicator() clear_typing_indicator()
update_pixel_shifting() update_pixel_shifting(TRUE)
/mob/living/proc/update_pixel_shifting() /mob/living/proc/update_pixel_shifting(moved = FALSE)
if(active_blocking) if(active_blocking)
animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = 1.5, easing = SINE_EASING | EASE_OUT , flags = ANIMATION_END_NOW) animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = 1.5, flags = ANIMATION_END_NOW)
else else if(moved)
if(is_shifted) if(is_shifted)
is_shifted = FALSE is_shifted = FALSE
pixel_x = get_standard_pixel_x_offset(lying) pixel_x = get_standard_pixel_x_offset(lying)
modular_citadel/code/modules/mob/living/carbon/carbon.dm
-8
View File
@@ -14,14 +14,6 @@
SEND_SIGNAL(src, COMSIG_VORE_TOGGLED, src, voremode) SEND_SIGNAL(src, COMSIG_VORE_TOGGLED, src, voremode)
return TRUE return TRUE
/mob/living/carbon/Move(atom/newloc, direct = 0)
. = ..()
wrongdirmovedelay = FALSE
if((combat_flags & COMBAT_FLAG_COMBAT_ACTIVE) && client && lastmousedir)
if(lastmousedir != dir)
wrongdirmovedelay = TRUE
setDir(lastmousedir, ismousemovement = TRUE)
/mob/living/carbon/onMouseMove(object, location, control, params) /mob/living/carbon/onMouseMove(object, location, control, params)
if(!(combat_flags & COMBAT_FLAG_COMBAT_ACTIVE)) if(!(combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
return return