Finnishing touches

This commit is contained in:
Artur
2020-04-01 12:59:06 +03:00
parent dce23a40af
commit 4de14fbdf7
6 changed files with 12 additions and 8 deletions

View File

@@ -135,10 +135,14 @@
#define TRAIT_NOMARROW "nomarrow" // You don't make blood, with chemicals or nanites.
#define TRAIT_NOPULSE "nopulse" // Your heart doesn't beat.
#define TRAIT_EXEMPT_HEALTH_EVENTS "exempt-health-events"
#define TRAIT_PASSTABLE "passtable"
//non-mob traits
#define TRAIT_PARALYSIS "paralysis" //Used for limb-based paralysis, where replacing the limb will fix it
#define VEHICLE_TRAIT "vehicle" // inherited from riding vehicles
#define INNATE_TRAIT "innate"
// item traits
#define TRAIT_NODROP "nodrop"

View File

@@ -585,7 +585,7 @@ GLOBAL_LIST_EMPTY(species_list)
/proc/passtable_on(target, source)
var/mob/living/L = target
if (!HAS_TRAIT(L, TRAIT_PASSTABLE) && L.pass_flags & PASSTABLE)
if(!HAS_TRAIT(L, TRAIT_PASSTABLE) && L.pass_flags & PASSTABLE)
ADD_TRAIT(L, TRAIT_PASSTABLE, INNATE_TRAIT)
ADD_TRAIT(L, TRAIT_PASSTABLE, source)
L.pass_flags |= PASSTABLE

View File

@@ -500,7 +500,10 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
var/board_item_type = /obj/vehicle/ridden/scooter/skateboard
/obj/item/melee/skateboard/attack_self(mob/user)
new board_item_type(get_turf(user))
if(!user.canUseTopic(src, TRUE, FALSE, TRUE))
return
var/obj/vehicle/ridden/scooter/skateboard/S = new board_item_type(get_turf(user))
S.buckle_mob(user)
qdel(src)
/obj/item/melee/skateboard/pro
@@ -509,7 +512,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
icon_state = "skateboard2"
item_state = "skateboard2"
board_item_type = /obj/vehicle/ridden/scooter/skateboard/pro
custom_premium_price = 300
/obj/item/melee/skateboard/hoverboard
name = "hoverboard"
@@ -517,7 +519,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
icon_state = "hoverboard_red"
item_state = "hoverboard_red"
board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard
custom_premium_price = 2015
/obj/item/melee/skateboard/hoverboard/admin
name = "\improper Board Of Directors"

View File

@@ -45,7 +45,6 @@
icon_state = "skateboard"
density = FALSE
arms_required = 0
fall_off_if_missing_arms = FALSE
var/datum/effect_system/spark_spread/sparks
///Whether the board is currently grinding
var/grinding = FALSE
@@ -108,7 +107,7 @@
H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
H.updatehealth()
visible_message("<span class='danger'>[src] crashes into [A], sending [H] flying!</span>")
H.Paralyze(80)
H.Knockdown(80)
else
var/backdir = turn(dir, 180)
vehicle_move(backdir)
@@ -127,7 +126,7 @@
var/atom/throw_target = get_edge_target_turf(src, pick(GLOB.cardinals))
L.throw_at(throw_target, 2, 2)
visible_message("<span class='danger'>[L] loses [L.p_their()] footing and slams on the ground!</span>")
L.Paralyze(40)
L.Knockdown(40)
grinding = FALSE
icon_state = board_icon
return

View File

@@ -185,7 +185,7 @@
playsound(src, 'sound/effects/bang.ogg', 20, TRUE)
V.unbuckle_mob(L)
L.throw_at(landing_turf, 2, 2)
L.Paralyze(40)
L.Knockdown(40)
V.visible_message("<span class='danger'>[L] misses the landing and falls on [L.p_their()] face!</span>")
else
L.spin(4, 1)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 127 KiB