mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 19:22:56 +00:00
Adds a verb for rideable mobs to toggle rider control without a riding crop.
-Mountable mobs/borgs/taurs can now let the rider in control without requiring a riding crop. -And yes, riding crop has always been "the key" for rider control for these mechanics. -Also tweaks the AO a little bit more because ouch my ocd.
This commit is contained in:
@@ -84,4 +84,4 @@
|
|||||||
#define LIGHT_COLOR_INCANDESCENT_FLASHLIGHT "#FFCC66"
|
#define LIGHT_COLOR_INCANDESCENT_FLASHLIGHT "#FFCC66"
|
||||||
|
|
||||||
//Fake ambient occlusion filter
|
//Fake ambient occlusion filter
|
||||||
#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-2, size=4, offset=3, color="#04080F80")
|
#define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-1, size=2, offset=2, color="#04080F55") //VOREStation Edit for prettier visuals.
|
||||||
|
|||||||
@@ -23,3 +23,20 @@
|
|||||||
custom_exclaim = sanitize(input(usr, "This word or phrase will appear instead of 'exclaims', 'shouts' or 'yells': [src] exclaims, \"Hi!\"", "Custom Exclaim", null) as text)
|
custom_exclaim = sanitize(input(usr, "This word or phrase will appear instead of 'exclaims', 'shouts' or 'yells': [src] exclaims, \"Hi!\"", "Custom Exclaim", null) as text)
|
||||||
else
|
else
|
||||||
return
|
return
|
||||||
|
|
||||||
|
/mob/living/proc/toggle_rider_reins()
|
||||||
|
set name = "Give Reins"
|
||||||
|
set category = "Abilities"
|
||||||
|
set desc = "Let people riding on you control your movement."
|
||||||
|
|
||||||
|
if(riding_datum)
|
||||||
|
if(istype(riding_datum,/datum/riding))
|
||||||
|
if(riding_datum.keytype)
|
||||||
|
riding_datum.keytype = null
|
||||||
|
to_chat(src, "Rider control enabled.")
|
||||||
|
return
|
||||||
|
else
|
||||||
|
riding_datum.keytype = /obj/item/weapon/material/twohanded/fluff/riding_crop
|
||||||
|
to_chat(src, "Rider control restricted.")
|
||||||
|
return
|
||||||
|
return
|
||||||
@@ -57,5 +57,6 @@
|
|||||||
R.wideborg = TRUE
|
R.wideborg = TRUE
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
|
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
|
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
|
||||||
|
R.verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
R.verbs |= /mob/living/proc/shred_limb
|
R.verbs |= /mob/living/proc/shred_limb
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/rest_style
|
R.verbs |= /mob/living/silicon/robot/proc/rest_style
|
||||||
@@ -190,6 +190,7 @@
|
|||||||
R.wideborg = TRUE
|
R.wideborg = TRUE
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
|
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
|
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
|
||||||
|
R.verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
R.verbs |= /mob/living/proc/shred_limb
|
R.verbs |= /mob/living/proc/shred_limb
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/rest_style
|
R.verbs |= /mob/living/silicon/robot/proc/rest_style
|
||||||
..()
|
..()
|
||||||
@@ -264,6 +265,7 @@
|
|||||||
R.wideborg = TRUE
|
R.wideborg = TRUE
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
|
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
|
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
|
||||||
|
R.verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
R.verbs |= /mob/living/proc/shred_limb
|
R.verbs |= /mob/living/proc/shred_limb
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/rest_style
|
R.verbs |= /mob/living/silicon/robot/proc/rest_style
|
||||||
..()
|
..()
|
||||||
@@ -311,6 +313,7 @@
|
|||||||
R.wideborg = TRUE
|
R.wideborg = TRUE
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
|
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
|
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
|
||||||
|
R.verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
R.verbs |= /mob/living/proc/shred_limb
|
R.verbs |= /mob/living/proc/shred_limb
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/rest_style
|
R.verbs |= /mob/living/silicon/robot/proc/rest_style
|
||||||
..()
|
..()
|
||||||
@@ -392,6 +395,7 @@
|
|||||||
R.wideborg = TRUE
|
R.wideborg = TRUE
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
|
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
|
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
|
||||||
|
R.verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
R.verbs |= /mob/living/proc/shred_limb
|
R.verbs |= /mob/living/proc/shred_limb
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/rest_style
|
R.verbs |= /mob/living/silicon/robot/proc/rest_style
|
||||||
..()
|
..()
|
||||||
@@ -439,6 +443,7 @@
|
|||||||
R.wideborg = TRUE
|
R.wideborg = TRUE
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
|
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
|
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
|
||||||
|
R.verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
R.verbs |= /mob/living/proc/shred_limb
|
R.verbs |= /mob/living/proc/shred_limb
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/rest_style
|
R.verbs |= /mob/living/silicon/robot/proc/rest_style
|
||||||
..()
|
..()
|
||||||
@@ -567,6 +572,7 @@
|
|||||||
R.wideborg = TRUE
|
R.wideborg = TRUE
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
|
R.verbs |= /mob/living/silicon/robot/proc/ex_reserve_refill
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
|
R.verbs |= /mob/living/silicon/robot/proc/robot_mount
|
||||||
|
R.verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
R.verbs |= /mob/living/proc/shred_limb
|
R.verbs |= /mob/living/proc/shred_limb
|
||||||
R.verbs |= /mob/living/silicon/robot/proc/rest_style
|
R.verbs |= /mob/living/silicon/robot/proc/rest_style
|
||||||
..()
|
..()
|
||||||
@@ -582,6 +588,7 @@
|
|||||||
R.scrubbing = FALSE
|
R.scrubbing = FALSE
|
||||||
R.verbs -= /mob/living/silicon/robot/proc/ex_reserve_refill
|
R.verbs -= /mob/living/silicon/robot/proc/ex_reserve_refill
|
||||||
R.verbs -= /mob/living/silicon/robot/proc/robot_mount
|
R.verbs -= /mob/living/silicon/robot/proc/robot_mount
|
||||||
|
R.verbs -= /mob/living/proc/toggle_rider_reins
|
||||||
R.verbs -= /mob/living/proc/shred_limb
|
R.verbs -= /mob/living/proc/shred_limb
|
||||||
R.verbs -= /mob/living/silicon/robot/proc/rest_style
|
R.verbs -= /mob/living/silicon/robot/proc/rest_style
|
||||||
..()
|
..()
|
||||||
@@ -112,6 +112,7 @@
|
|||||||
if(!riding_datum)
|
if(!riding_datum)
|
||||||
riding_datum = new /datum/riding/simple_mob(src)
|
riding_datum = new /datum/riding/simple_mob(src)
|
||||||
verbs |= /mob/living/simple_mob/proc/animal_mount
|
verbs |= /mob/living/simple_mob/proc/animal_mount
|
||||||
|
verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
movement_cooldown = 0
|
movement_cooldown = 0
|
||||||
|
|
||||||
/mob/living/simple_mob/vore/aggressive/corrupthound/MouseDrop_T(mob/living/M, mob/living/user)
|
/mob/living/simple_mob/vore/aggressive/corrupthound/MouseDrop_T(mob/living/M, mob/living/user)
|
||||||
|
|||||||
@@ -55,6 +55,7 @@
|
|||||||
if(!riding_datum)
|
if(!riding_datum)
|
||||||
riding_datum = new /datum/riding/simple_mob(src)
|
riding_datum = new /datum/riding/simple_mob(src)
|
||||||
verbs |= /mob/living/simple_mob/proc/animal_mount
|
verbs |= /mob/living/simple_mob/proc/animal_mount
|
||||||
|
verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
movement_cooldown = 0
|
movement_cooldown = 0
|
||||||
|
|
||||||
/mob/living/simple_mob/vore/aggressive/deathclaw/MouseDrop_T(mob/living/M, mob/living/user)
|
/mob/living/simple_mob/vore/aggressive/deathclaw/MouseDrop_T(mob/living/M, mob/living/user)
|
||||||
|
|||||||
@@ -66,6 +66,7 @@
|
|||||||
if(!riding_datum)
|
if(!riding_datum)
|
||||||
riding_datum = new /datum/riding/simple_mob(src)
|
riding_datum = new /datum/riding/simple_mob(src)
|
||||||
verbs |= /mob/living/simple_mob/proc/animal_mount
|
verbs |= /mob/living/simple_mob/proc/animal_mount
|
||||||
|
verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
movement_cooldown = 0
|
movement_cooldown = 0
|
||||||
|
|
||||||
/mob/living/simple_mob/vore/aggressive/dragon/MouseDrop_T(mob/living/M, mob/living/user)
|
/mob/living/simple_mob/vore/aggressive/dragon/MouseDrop_T(mob/living/M, mob/living/user)
|
||||||
|
|||||||
@@ -71,6 +71,7 @@
|
|||||||
if(!riding_datum)
|
if(!riding_datum)
|
||||||
riding_datum = new /datum/riding/simple_mob(src)
|
riding_datum = new /datum/riding/simple_mob(src)
|
||||||
verbs |= /mob/living/simple_mob/proc/animal_mount
|
verbs |= /mob/living/simple_mob/proc/animal_mount
|
||||||
|
verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
movement_cooldown = 0
|
movement_cooldown = 0
|
||||||
|
|
||||||
/mob/living/simple_mob/vore/hippo/MouseDrop_T(mob/living/M, mob/living/user)
|
/mob/living/simple_mob/vore/hippo/MouseDrop_T(mob/living/M, mob/living/user)
|
||||||
|
|||||||
@@ -45,6 +45,7 @@
|
|||||||
if(!riding_datum)
|
if(!riding_datum)
|
||||||
riding_datum = new /datum/riding/simple_mob(src)
|
riding_datum = new /datum/riding/simple_mob(src)
|
||||||
verbs |= /mob/living/simple_mob/proc/animal_mount
|
verbs |= /mob/living/simple_mob/proc/animal_mount
|
||||||
|
verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
movement_cooldown = 0
|
movement_cooldown = 0
|
||||||
|
|
||||||
/mob/living/simple_mob/vore/horse/MouseDrop_T(mob/living/M, mob/living/user)
|
/mob/living/simple_mob/vore/horse/MouseDrop_T(mob/living/M, mob/living/user)
|
||||||
|
|||||||
@@ -262,6 +262,7 @@
|
|||||||
if(!riding_datum)
|
if(!riding_datum)
|
||||||
riding_datum = new /datum/riding/simple_mob(src)
|
riding_datum = new /datum/riding/simple_mob(src)
|
||||||
verbs |= /mob/living/simple_mob/proc/animal_mount
|
verbs |= /mob/living/simple_mob/proc/animal_mount
|
||||||
|
verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
movement_cooldown = 0
|
movement_cooldown = 0
|
||||||
|
|
||||||
/mob/living/simple_mob/otie/MouseDrop_T(mob/living/M, mob/living/user)
|
/mob/living/simple_mob/otie/MouseDrop_T(mob/living/M, mob/living/user)
|
||||||
|
|||||||
@@ -50,6 +50,7 @@
|
|||||||
if(!riding_datum)
|
if(!riding_datum)
|
||||||
riding_datum = new /datum/riding/simple_mob(src)
|
riding_datum = new /datum/riding/simple_mob(src)
|
||||||
verbs |= /mob/living/simple_mob/proc/animal_mount
|
verbs |= /mob/living/simple_mob/proc/animal_mount
|
||||||
|
verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
movement_cooldown = 0
|
movement_cooldown = 0
|
||||||
|
|
||||||
/mob/living/simple_mob/vore/aggressive/panther/MouseDrop_T(mob/living/M, mob/living/user)
|
/mob/living/simple_mob/vore/aggressive/panther/MouseDrop_T(mob/living/M, mob/living/user)
|
||||||
|
|||||||
@@ -174,6 +174,7 @@
|
|||||||
if(!riding_datum)
|
if(!riding_datum)
|
||||||
riding_datum = new /datum/riding/simple_mob(src)
|
riding_datum = new /datum/riding/simple_mob(src)
|
||||||
verbs |= /mob/living/simple_mob/proc/animal_mount
|
verbs |= /mob/living/simple_mob/proc/animal_mount
|
||||||
|
verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
movement_cooldown = 0
|
movement_cooldown = 0
|
||||||
|
|
||||||
/mob/living/simple_mob/vore/aggressive/rat/MouseDrop_T(mob/living/M, mob/living/user)
|
/mob/living/simple_mob/vore/aggressive/rat/MouseDrop_T(mob/living/M, mob/living/user)
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ var/global/list/wing_icon_cache = list()
|
|||||||
if(taurtype.can_ride && !riding_datum)
|
if(taurtype.can_ride && !riding_datum)
|
||||||
riding_datum = new /datum/riding/taur(src)
|
riding_datum = new /datum/riding/taur(src)
|
||||||
verbs |= /mob/living/carbon/human/proc/taur_mount
|
verbs |= /mob/living/carbon/human/proc/taur_mount
|
||||||
|
verbs |= /mob/living/proc/toggle_rider_reins
|
||||||
return image(tail_s, "pixel_x" = -16)
|
return image(tail_s, "pixel_x" = -16)
|
||||||
else
|
else
|
||||||
return image(tail_s)
|
return image(tail_s)
|
||||||
|
|||||||
Reference in New Issue
Block a user