mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-22 06:56:31 +00:00
88f259980b
## About The Pull Request WHAT HAS CHANGED MECHANICALLY You can now lean up against walls. https://github.com/tgstation/tgstation/assets/55666666/bf81b7b5-6cab-4fc3-9887-075351511505 To lean against a wall, simply face opposite to it and drag your sprite onto it. Doing so makes you non-dense, just like if you were laying down. This means people can walk through you, but you are still susceptible to melee and ranged attacks. Leaning up against a wall also mitigates your FOV loss by 30 degrees, as you can have a better look at your surrounding when you put more of your surroundings infront of you. Because it seemed thematic to lean up against the wall while smoking and then flick a cigarette away, cigarettes will now say they where "flicked" instead of thrown when you toss them, I also took the time to add a bit of variation into the throw text. A few bugs where you could become non dense and then run straight through people has been patched. NOT PLAYER FACING So basically I've implemented a system that keeps effects that manage a mob's density consistent with eachother. An example of some of the situations that could occur Effect A would render a spaceman undense and turn the player dense again once it was concluded Effect B would render a spaceman undense and then after a timer revert the spaceman to whatever state the spaceman was in before effect B started. Thus if you enabled effect A and then Effect B, setting your previous state of denseness to undense, and then concluded effect A, when Effect B would finish it would put you back into the state of density you were in when you started. This would render the spaceman permanently undense. To solve this, the system has been updated so that all instances of density adjustment to mobs are handled by traits from unique sources (with the exception undensity gained by laying down due to its prevalence.) All effects that handle density will no longer step on each others toes and can now be rain simultaneously without fear. ## Why It's Good For The Game Leaning is cool. Bugs are bad. ## Changelog 🆑 itseasytosee add: You can now lean against walls! Simply turn your back to the wall and clickdrag yourself onto it. fix: There should no longer be any instances of spacemen being able to run straight through eachother as if they weren't even there. spellcheck: Added more variance to item throwing text. refactor: Mob density has been refactored /🆑
162 lines
4.9 KiB
Plaintext
162 lines
4.9 KiB
Plaintext
/mob/living/silicon/pai/mob_try_pickup(mob/living/user, instant=FALSE)
|
|
if(!possible_chassis[chassis])
|
|
to_chat(user, span_warning("[src]'s current form isn't able to be carried!"))
|
|
return FALSE
|
|
return ..()
|
|
|
|
/mob/living/silicon/pai/start_pulling(atom/movable/thing, state, force = move_force, supress_message = FALSE)
|
|
return FALSE
|
|
|
|
/mob/living/silicon/pai/update_resting()
|
|
. = ..()
|
|
update_appearance(UPDATE_ICON_STATE)
|
|
if(loc != card)
|
|
visible_message(span_notice("[src] [resting? "lays down for a moment..." : "perks up from the ground."]"))
|
|
|
|
/mob/living/silicon/pai/wabbajack(what_to_randomize, change_flags = WABBAJACK)
|
|
if(length(possible_chassis) < 2)
|
|
return FALSE
|
|
var/holochassis = pick(possible_chassis - chassis)
|
|
set_holochassis(holochassis)
|
|
balloon_alert(src, "[holochassis] composite engaged")
|
|
return TRUE
|
|
|
|
/**
|
|
* Checks if we are allowed to interact with a radial menu
|
|
*
|
|
* @param {atom} anchor - The atom that is anchoring the menu.
|
|
*
|
|
* @returns {boolean} - TRUE if we are allowed to interact with the menu,
|
|
* FALSE otherwise.
|
|
*/
|
|
/mob/living/silicon/pai/proc/check_menu(atom/anchor)
|
|
if(incapacitated())
|
|
return FALSE
|
|
if(get_turf(src) != get_turf(anchor))
|
|
return FALSE
|
|
if(!isturf(loc) && loc != card)
|
|
balloon_alert(src, "can't do that here")
|
|
return FALSE
|
|
return TRUE
|
|
|
|
/**
|
|
* Sets a new holochassis skin based on a pAI's choice.
|
|
*
|
|
* @returns {boolean} - True if the skin was successfully set.
|
|
* FALSE otherwise.
|
|
*/
|
|
/mob/living/silicon/pai/proc/choose_chassis()
|
|
var/list/skins = list()
|
|
for(var/holochassis_option in possible_chassis)
|
|
var/image/item_image = image(icon = src.icon, icon_state = holochassis_option)
|
|
skins += list("[holochassis_option]" = item_image)
|
|
sort_list(skins)
|
|
var/atom/anchor = get_atom_on_turf(src)
|
|
var/choice = show_radial_menu(src, anchor, skins, custom_check = CALLBACK(src, PROC_REF(check_menu), anchor), radius = 40, require_near = TRUE)
|
|
if(!choice)
|
|
return FALSE
|
|
set_holochassis(choice)
|
|
balloon_alert(src, "[choice] composite engaged")
|
|
update_resting()
|
|
return TRUE
|
|
|
|
/**
|
|
* Returns the pAI to card mode.
|
|
*
|
|
* @param {boolean} force - If TRUE, the pAI will be forced to card mode.
|
|
*
|
|
* @returns {boolean} - TRUE if the pAI was forced to card mode.
|
|
* FALSE otherwise.
|
|
*/
|
|
/mob/living/silicon/pai/proc/fold_in(force = FALSE)
|
|
holochassis_ready = FALSE
|
|
if(!force)
|
|
addtimer(VARSET_CALLBACK(src, holochassis_ready, TRUE), HOLOCHASSIS_COOLDOWN)
|
|
else
|
|
addtimer(VARSET_CALLBACK(src, holochassis_ready, TRUE), HOLOCHASSIS_OVERLOAD_COOLDOWN)
|
|
set_resting(FALSE, silent = TRUE, instant = TRUE)
|
|
if(!holoform)
|
|
. = fold_out(force)
|
|
return FALSE
|
|
visible_message(span_notice("[src] dematerialises!"))
|
|
stop_pulling()
|
|
if(ispickedupmob(loc))
|
|
var/obj/item/clothing/head/mob_holder/mob_head = loc
|
|
mob_head.release(display_messages = FALSE)
|
|
if(client)
|
|
client.perspective = EYE_PERSPECTIVE
|
|
client.set_eye(card)
|
|
if (isturf(loc))
|
|
new /obj/effect/temp_visual/guardian/phase/out(loc)
|
|
forceMove(card)
|
|
add_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED), PAI_FOLDED)
|
|
ADD_TRAIT(src, TRAIT_UNDENSE, PAI_FOLDED)
|
|
set_light_on(FALSE)
|
|
holoform = FALSE
|
|
set_resting(resting)
|
|
return TRUE
|
|
|
|
/**
|
|
* Engage holochassis form.
|
|
*
|
|
* @param {boolean} force - Force the form to engage.
|
|
*
|
|
* @returns {boolean} - TRUE if the form was successfully engaged.
|
|
* FALSE otherwise.
|
|
*/
|
|
/mob/living/silicon/pai/proc/fold_out(force = FALSE)
|
|
if(holochassis_health < 0)
|
|
balloon_alert(src, "emitter repair incomplete")
|
|
return FALSE
|
|
if(!can_holo && !force)
|
|
balloon_alert(src, "emitters are disabled")
|
|
return FALSE
|
|
if(holoform)
|
|
. = fold_in(force)
|
|
return
|
|
if(!holochassis_ready)
|
|
balloon_alert(src, "emitters recycling...")
|
|
return FALSE
|
|
holochassis_ready = FALSE
|
|
addtimer(VARSET_CALLBACK(src, holochassis_ready, TRUE), HOLOCHASSIS_COOLDOWN)
|
|
REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, PAI_FOLDED)
|
|
REMOVE_TRAIT(src, TRAIT_HANDS_BLOCKED, PAI_FOLDED)
|
|
REMOVE_TRAIT(src, TRAIT_UNDENSE, PAI_FOLDED)
|
|
if(istype(card.loc, /obj/item/modular_computer))
|
|
var/obj/item/modular_computer/pc = card.loc
|
|
pc.inserted_pai = null
|
|
pc.visible_message(span_notice("[src] ejects itself from [pc]!"))
|
|
card.forceMove(get_turf(pc))
|
|
forceMove(get_turf(card))
|
|
if(client)
|
|
client.perspective = EYE_PERSPECTIVE
|
|
client.set_eye(src)
|
|
set_light_on(FALSE)
|
|
update_appearance(UPDATE_ICON_STATE)
|
|
visible_message(span_boldnotice("[src] appears in a flash of light!"))
|
|
holoform = TRUE
|
|
return TRUE
|
|
|
|
/**
|
|
* Sets the holochassis skin and updates the icons
|
|
*
|
|
* @param {string} choice - The skin that will be used for the pAI holoform
|
|
*
|
|
* @returns {boolean} - TRUE if the skin was successfully set. FALSE otherwise.
|
|
*/
|
|
/mob/living/silicon/pai/proc/set_holochassis(choice)
|
|
if(!choice)
|
|
return FALSE
|
|
chassis = choice
|
|
update_appearance(UPDATE_DESC | UPDATE_ICON_STATE)
|
|
return TRUE
|
|
|
|
/**
|
|
* Toggles the onboard light
|
|
*
|
|
* @returns {boolean} - TRUE if the light was toggled.
|
|
*/
|
|
/mob/living/silicon/pai/proc/toggle_integrated_light()
|
|
set_light_on(!light_on)
|
|
return TRUE
|