mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-14 12:13:06 +00:00
Fixes some items on working on people on tables
This commit is contained in:
@@ -124,6 +124,12 @@
|
|||||||
desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing."
|
desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing."
|
||||||
icon_state = "stethoscope"
|
icon_state = "stethoscope"
|
||||||
|
|
||||||
|
/obj/item/clothing/accessory/stethoscope/do_surgery(mob/living/carbon/human/M, mob/living/user)
|
||||||
|
if(user.a_intent != I_HELP) //in case it is ever used as a surgery tool
|
||||||
|
return ..()
|
||||||
|
attack(M, user) //default surgery behaviour is just to scan as usual
|
||||||
|
return 1
|
||||||
|
|
||||||
/obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/M, mob/living/user)
|
/obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/M, mob/living/user)
|
||||||
if(ishuman(M) && isliving(user))
|
if(ishuman(M) && isliving(user))
|
||||||
if(user.a_intent == I_HELP)
|
if(user.a_intent == I_HELP)
|
||||||
|
|||||||
@@ -16,7 +16,18 @@
|
|||||||
matter = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 200)
|
matter = list(DEFAULT_WALL_MATERIAL = 500, "glass" = 200)
|
||||||
var/mode = 1;
|
var/mode = 1;
|
||||||
|
|
||||||
|
|
||||||
|
/obj/item/device/robotanalyzer/do_surgery(mob/living/M, mob/living/user)
|
||||||
|
if(user.a_intent != I_HELP) //in case it is ever used as a surgery tool
|
||||||
|
return ..()
|
||||||
|
do_scan(M, user) //default surgery behaviour is just to scan as usual
|
||||||
|
return 1
|
||||||
|
|
||||||
|
|
||||||
/obj/item/device/robotanalyzer/attack(mob/living/M as mob, mob/living/user as mob)
|
/obj/item/device/robotanalyzer/attack(mob/living/M as mob, mob/living/user as mob)
|
||||||
|
do_scan(M, user)
|
||||||
|
|
||||||
|
/obj/item/device/robotanalyzer/proc/do_scan(mob/living/M as mob, mob/living/user as mob)
|
||||||
if((CLUMSY in user.mutations) && prob(50))
|
if((CLUMSY in user.mutations) && prob(50))
|
||||||
user << text("\red You try to analyze the floor's vitals!")
|
user << text("\red You try to analyze the floor's vitals!")
|
||||||
for(var/mob/O in viewers(M, null))
|
for(var/mob/O in viewers(M, null))
|
||||||
|
|||||||
@@ -19,10 +19,15 @@
|
|||||||
if(!icon_state)
|
if(!icon_state)
|
||||||
icon_state = "pill[rand(1, 20)]"
|
icon_state = "pill[rand(1, 20)]"
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/pill/attack(mob/M as mob, mob/user as mob, def_zone)
|
|
||||||
|
|
||||||
|
/obj/item/weapon/reagent_containers/pill/do_surgery(mob/M, mob/user)
|
||||||
|
if(user.a_intent != I_HELP) //in case it is ever used as a surgery tool
|
||||||
|
return ..()
|
||||||
|
attack(M, user) //default surgery behaviour is just to scan as usual
|
||||||
|
return 1
|
||||||
|
|
||||||
|
/obj/item/weapon/reagent_containers/pill/attack(mob/M as mob, mob/user as mob)
|
||||||
if(M == user)
|
if(M == user)
|
||||||
|
|
||||||
if(istype(M, /mob/living/carbon/human))
|
if(istype(M, /mob/living/carbon/human))
|
||||||
var/mob/living/carbon/human/H = M
|
var/mob/living/carbon/human/H = M
|
||||||
if(!H.check_has_mouth())
|
if(!H.check_has_mouth())
|
||||||
|
|||||||
36
html/changelogs/Yoshax - ItemFixes.yml
Normal file
36
html/changelogs/Yoshax - ItemFixes.yml
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
################################
|
||||||
|
# Example Changelog File
|
||||||
|
#
|
||||||
|
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||||
|
#
|
||||||
|
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||||
|
# When it is, any changes listed below will disappear.
|
||||||
|
#
|
||||||
|
# Valid Prefixes:
|
||||||
|
# bugfix
|
||||||
|
# wip (For works in progress)
|
||||||
|
# tweak
|
||||||
|
# soundadd
|
||||||
|
# sounddel
|
||||||
|
# rscadd (general adding of nice things)
|
||||||
|
# rscdel (general deleting of nice things)
|
||||||
|
# imageadd
|
||||||
|
# imagedel
|
||||||
|
# maptweak
|
||||||
|
# spellcheck (typo fixes)
|
||||||
|
# experiment
|
||||||
|
#################################
|
||||||
|
|
||||||
|
# Your name.
|
||||||
|
author: Yoshax
|
||||||
|
|
||||||
|
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||||
|
delete-after: True
|
||||||
|
|
||||||
|
# Any changes you've made. See valid prefix list above.
|
||||||
|
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||||
|
# SCREW THIS UP AND IT WON'T WORK.
|
||||||
|
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||||
|
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||||
|
changes:
|
||||||
|
- bugfix: "Certain items such as pills and suchlike will once again be usable on someone who is on a surgical table/table."
|
||||||
Reference in New Issue
Block a user