mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-30 02:52:30 +00:00
707fc287b4
About The Pull Request
This PR removes intents and replaces them with a combat mode. An explanation of what this means can be found below
Major changes:
Disarm and Grab intents have been removed.
Harm/Help is now combat mode, toggled by F or 4 by default
The context/verb/popup menu now only works when you do shift+right-click
Right click is now disarm, both in and out of combat mode.
Grabbing is now on ctrl-click.
If you're in combat mode, and are currently grabbing/pulling someone, and ctrl-click somewhere else, it will not release the grab (To prevent misclicks)
Minor interaction changes:
Right click to dissasemble tables, racks, filing cabinets (When holding the right tool to do so)
Left click to stunbaton, right click to harmbaton
Right click to tip cows
Right click to malpractice surgery
Right click to hold people at gunpoint (if youre holding a gun)
Why It's Good For The Game
Intents heavily cripple both the code and the UI design of interactions. While I understand that a lot of people will dislike this PR as they are used to intents, they are one of our weakest links in terms of explaining to players how to do specific things, and require a lot more keypresses to do compared to this.
As an example, martial arts can now be done without having to juggle 1 2 3 and 4 to switch intents quickly.
As some of you who saw the first combat mode PR, the context menu used to be disabled in combat mode. In this version it is instead on shift-right click ensuring that you can always use it in the same way.
In this version, combat mode also no longer prevents you from attacking with items when you would so before, as this was something that was commonly complained about.
The full intention of this shift in control scheme is that right click will become "secondary interaction" for items, which prevents some of the awkward juggling we have now with item modes etcetera.
Changelog
cl Qustinnus
add: Intents have been replaced with a combat mode. For more info find the PR here: #56601
/cl
121 lines
4.0 KiB
Plaintext
121 lines
4.0 KiB
Plaintext
//Nearsightedness restricts your vision by several tiles.
|
|
/datum/mutation/human/nearsight
|
|
name = "Near Sightness"
|
|
desc = "The holder of this mutation has poor eyesight."
|
|
quality = MINOR_NEGATIVE
|
|
text_gain_indication = "<span class='danger'>You can't see very well.</span>"
|
|
|
|
/datum/mutation/human/nearsight/on_acquiring(mob/living/carbon/human/owner)
|
|
if(..())
|
|
return
|
|
owner.become_nearsighted(GENETIC_MUTATION)
|
|
|
|
/datum/mutation/human/nearsight/on_losing(mob/living/carbon/human/owner)
|
|
if(..())
|
|
return
|
|
owner.cure_nearsighted(GENETIC_MUTATION)
|
|
|
|
|
|
///Blind makes you blind. Who knew?
|
|
/datum/mutation/human/blind
|
|
name = "Blindness"
|
|
desc = "Renders the subject completely blind."
|
|
quality = NEGATIVE
|
|
text_gain_indication = "<span class='danger'>You can't seem to see anything.</span>"
|
|
|
|
/datum/mutation/human/blind/on_acquiring(mob/living/carbon/human/owner)
|
|
if(..())
|
|
return
|
|
owner.become_blind(GENETIC_MUTATION)
|
|
|
|
/datum/mutation/human/blind/on_losing(mob/living/carbon/human/owner)
|
|
if(..())
|
|
return
|
|
owner.cure_blind(GENETIC_MUTATION)
|
|
|
|
///Thermal Vision lets you see mobs through walls
|
|
/datum/mutation/human/thermal
|
|
name = "Thermal Vision"
|
|
desc = "The user of this genome can visually perceive the unique human thermal signature."
|
|
quality = POSITIVE
|
|
difficulty = 18
|
|
text_gain_indication = "<span class='notice'>You can see the heat rising off of your skin...</span>"
|
|
time_coeff = 2
|
|
instability = 25
|
|
var/visionflag = TRAIT_THERMAL_VISION
|
|
|
|
/datum/mutation/human/thermal/on_acquiring(mob/living/carbon/human/owner)
|
|
if(..())
|
|
return
|
|
|
|
ADD_TRAIT(owner, visionflag, GENETIC_MUTATION)
|
|
owner.update_sight()
|
|
|
|
/datum/mutation/human/thermal/on_losing(mob/living/carbon/human/owner)
|
|
if(..())
|
|
return
|
|
REMOVE_TRAIT(owner, visionflag, GENETIC_MUTATION)
|
|
owner.update_sight()
|
|
|
|
///X-ray Vision lets you see through walls.
|
|
/datum/mutation/human/thermal/x_ray
|
|
name = "X Ray Vision"
|
|
desc = "A strange genome that allows the user to see between the spaces of walls." //actual x-ray would mean you'd constantly be blasting rads, wich might be fun for later //hmb
|
|
text_gain_indication = "<span class='notice'>The walls suddenly disappear!</span>"
|
|
instability = 35
|
|
locked = TRUE
|
|
visionflag = TRAIT_XRAY_VISION
|
|
|
|
///Laser Eyes lets you shoot lasers from your eyes!
|
|
/datum/mutation/human/laser_eyes
|
|
name = "Laser Eyes"
|
|
desc = "Reflects concentrated light back from the eyes."
|
|
quality = POSITIVE
|
|
locked = TRUE
|
|
difficulty = 16
|
|
text_gain_indication = "<span class='notice'>You feel pressure building up behind your eyes.</span>"
|
|
layer_used = FRONT_MUTATIONS_LAYER
|
|
limb_req = BODY_ZONE_HEAD
|
|
|
|
/datum/mutation/human/laser_eyes/New(class_ = MUT_OTHER, timer, datum/mutation/human/copymut)
|
|
..()
|
|
if(!(type in visual_indicators))
|
|
visual_indicators[type] = list(mutable_appearance('icons/effects/genetics.dmi', "lasereyes", -FRONT_MUTATIONS_LAYER))
|
|
|
|
/datum/mutation/human/laser_eyes/on_acquiring(mob/living/carbon/human/H)
|
|
. = ..()
|
|
if(.)
|
|
return
|
|
RegisterSignal(H, COMSIG_MOB_ATTACK_RANGED, .proc/on_ranged_attack)
|
|
|
|
/datum/mutation/human/laser_eyes/on_losing(mob/living/carbon/human/H)
|
|
. = ..()
|
|
if(.)
|
|
return
|
|
UnregisterSignal(H, COMSIG_MOB_ATTACK_RANGED)
|
|
|
|
/datum/mutation/human/laser_eyes/get_visual_indicator()
|
|
return visual_indicators[type][1]
|
|
|
|
///Triggers on COMSIG_MOB_ATTACK_RANGED. Does the projectile shooting.
|
|
/datum/mutation/human/laser_eyes/proc/on_ranged_attack(mob/living/carbon/human/source, atom/target, mouseparams)
|
|
SIGNAL_HANDLER
|
|
|
|
if(!source.combat_mode)
|
|
return
|
|
to_chat(source, "<span class='warning'>You shoot with your laser eyes!</span>")
|
|
source.changeNext_move(CLICK_CD_RANGE)
|
|
source.newtonian_move(get_dir(target, source))
|
|
var/obj/projectile/beam/laser_eyes/LE = new(source.loc)
|
|
LE.firer = source
|
|
LE.def_zone = ran_zone(source.zone_selected)
|
|
LE.preparePixelProjectile(target, source, mouseparams)
|
|
INVOKE_ASYNC(LE, /obj/projectile.proc/fire)
|
|
playsound(source, 'sound/weapons/taser2.ogg', 75, TRUE)
|
|
|
|
///Projectile type used by laser eyes
|
|
/obj/projectile/beam/laser_eyes
|
|
name = "beam"
|
|
icon = 'icons/effects/genetics.dmi'
|
|
icon_state = "eyelasers"
|