mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-31 07:58:22 +01:00
@@ -129,13 +129,13 @@
|
||||
vision = H.internal_organs_by_name[H.species.vision_organ]
|
||||
if(!vision)
|
||||
user.visible_message(span_infoplain(span_bold("\The [user]") + " directs [src] at [M]'s face."), \
|
||||
span_notice("You direct [src] at [M]'s face."))
|
||||
span_notice("You direct [src] at [M]'s face."))
|
||||
to_chat(user, span_warning("You can't find any [H.species.vision_organ ? H.species.vision_organ : "eyes"] on [H]!"))
|
||||
user.setClickCooldown(user.get_attack_speed(src))
|
||||
return
|
||||
|
||||
user.visible_message(span_infoplain(span_bold("\The [user]") + " directs [src] to [M]'s eyes."), \
|
||||
span_notice("You direct [src] to [M]'s eyes."))
|
||||
span_notice("You direct [src] to [M]'s eyes."))
|
||||
if(H != user) //can't look into your own eyes buster
|
||||
if(M.stat == DEAD || M.blinded) //mob is dead or fully blind
|
||||
to_chat(user, span_warning("\The [M]'s pupils do not react to the light!"))
|
||||
|
||||
@@ -133,8 +133,8 @@
|
||||
for(var/datum/data/record/L in data_core.locked)
|
||||
if(L.fields["id"] == exploit_id)
|
||||
data["exploit"] = list() // Setting this to equal L.fields passes it's variables that are lists as reference instead of value.
|
||||
// We trade off being able to automatically add shit for more control over what gets passed to json
|
||||
// and if it's sanitized for html.
|
||||
// We trade off being able to automatically add shit for more control over what gets passed to json
|
||||
// and if it's sanitized for html.
|
||||
data["exploit"]["nanoui_exploit_record"] = html_encode(L.fields["exploit_record"]) // Change stuff into html
|
||||
data["exploit"]["nanoui_exploit_record"] = replacetext(data["exploit"]["nanoui_exploit_record"], "\n", "<br>") // change line breaks into <br>
|
||||
data["exploit"]["name"] = html_encode(L.fields["name"])
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
step_towards(leash_pet, leash_master)
|
||||
|
||||
/obj/item/leash/dropped(mob/user)
|
||||
//Drop the leash, and the leash effects stop
|
||||
//Drop the leash, and the leash effects stop
|
||||
. = ..()
|
||||
if(!leash_pet || !leash_master) //There is no pet. Stop this silliness
|
||||
return
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
var/selection_string = "Select an item:"
|
||||
var/selection_title = "Item Selection"
|
||||
var/list/item_options = list("Gift" = /obj/item/a_gift,
|
||||
"Health Analyzer" = /obj/item/healthanalyzer)
|
||||
"Health Analyzer" = /obj/item/healthanalyzer)
|
||||
|
||||
/obj/item/selectable_item/attack_self(mob/user as mob)
|
||||
tgui_alert(user, {"[preface_string]"}, preface_title)
|
||||
|
||||
@@ -114,4 +114,4 @@
|
||||
else if(result == 2)
|
||||
comment = "heads"
|
||||
user.visible_message(span_notice("[user] has thrown \the [src]. It lands on [comment]!"), \
|
||||
span_notice("You throw \the [src]. It lands on [comment]!"))
|
||||
span_notice("You throw \the [src]. It lands on [comment]!"))
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
/datum/autopsy_data_scanner
|
||||
var/weapon = null // this is the DEFINITE weapon type that was used
|
||||
var/list/organs_scanned = list() // this maps a number of scanned organs to
|
||||
// the wounds to those organs with this data's weapon type
|
||||
var/list/organs_scanned = list() // this maps a number of scanned organs to
|
||||
// the wounds to those organs with this data's weapon type
|
||||
var/organ_names = ""
|
||||
|
||||
/datum/autopsy_data
|
||||
|
||||
@@ -51,15 +51,15 @@
|
||||
return
|
||||
if(H == user)
|
||||
user.visible_message(span_notice("[user] does their lips with \the [src]."), \
|
||||
span_notice("You take a moment to apply \the [src]. Perfect!"))
|
||||
span_notice("You take a moment to apply \the [src]. Perfect!"))
|
||||
H.lip_style = colour
|
||||
H.update_icons_body()
|
||||
else
|
||||
user.visible_message(span_warning("[user] begins to do [H]'s lips with \the [src]."), \
|
||||
span_notice("You begin to apply \the [src]."))
|
||||
span_notice("You begin to apply \the [src]."))
|
||||
if(do_after(user, 20, H)) //user needs to keep their active hand, H does not.
|
||||
user.visible_message(span_notice("[user] does [H]'s lips with \the [src]."), \
|
||||
span_notice("You apply \the [src]."))
|
||||
span_notice("You apply \the [src]."))
|
||||
H.lip_style = colour
|
||||
H.update_icons_body()
|
||||
else
|
||||
|
||||
@@ -552,6 +552,6 @@
|
||||
/obj/item/storage/backpack/satchel/ranger
|
||||
name = "ranger satchel"
|
||||
desc = "A satchel designed for the Go Go ERT Rangers series to allow for slightly bigger carry capacity for the ERT-Rangers.\
|
||||
Unlike the show claims, it is not a phoron-enhanced satchel of holding with plot-relevant content."
|
||||
Unlike the show claims, it is not a phoron-enhanced satchel of holding with plot-relevant content."
|
||||
icon = 'icons/obj/clothing/ranger.dmi'
|
||||
icon_state = "ranger_satchel"
|
||||
|
||||
Reference in New Issue
Block a user