mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
- Fixed nettle soup recipe says abstract nettle.
- Fixes hostile animals weakening non carbons, and adjusted weakening values 1958. - fixes being able to drop defib paddle by resting, fix a runtime linked to this. - can no longer pick card from deck while resting, same for paper bin and bedsheet bin. - examining extinguisher and atmos watertank nozzle gives you the amount of water remaining.
This commit is contained in:
@@ -757,6 +757,8 @@ obj/item/toy/cards/deck/New()
|
|||||||
|
|
||||||
|
|
||||||
obj/item/toy/cards/deck/attack_hand(mob/user as mob)
|
obj/item/toy/cards/deck/attack_hand(mob/user as mob)
|
||||||
|
if(user.lying)
|
||||||
|
return
|
||||||
var/choice = null
|
var/choice = null
|
||||||
if(cards.len == 0)
|
if(cards.len == 0)
|
||||||
src.icon_state = "deck_[deckstyle]_empty"
|
src.icon_state = "deck_[deckstyle]_empty"
|
||||||
@@ -827,7 +829,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user,
|
|||||||
|
|
||||||
/obj/item/toy/cards/deck/MouseDrop(atom/over_object)
|
/obj/item/toy/cards/deck/MouseDrop(atom/over_object)
|
||||||
var/mob/M = usr
|
var/mob/M = usr
|
||||||
if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained())
|
if(!ishuman(usr) || usr.incapacitated() || usr.lying)
|
||||||
return
|
return
|
||||||
if(Adjacent(usr))
|
if(Adjacent(usr))
|
||||||
if(over_object == M && loc != M)
|
if(over_object == M && loc != M)
|
||||||
|
|||||||
@@ -312,7 +312,7 @@
|
|||||||
defib.on = 0
|
defib.on = 0
|
||||||
loc = defib
|
loc = defib
|
||||||
defib.update_icon()
|
defib.update_icon()
|
||||||
return unwield()
|
return unwield(user)
|
||||||
|
|
||||||
/obj/item/weapon/twohanded/shockpaddles/proc/check_defib_exists(mainunit, var/mob/living/carbon/human/M, var/obj/O)
|
/obj/item/weapon/twohanded/shockpaddles/proc/check_defib_exists(mainunit, var/mob/living/carbon/human/M, var/obj/O)
|
||||||
if (!mainunit || !istype(mainunit, /obj/item/weapon/defibrillator)) //To avoid weird issues from admin spawns
|
if (!mainunit || !istype(mainunit, /obj/item/weapon/defibrillator)) //To avoid weird issues from admin spawns
|
||||||
|
|||||||
@@ -46,6 +46,13 @@
|
|||||||
user << "The safety is [safety ? "on" : "off"]."
|
user << "The safety is [safety ? "on" : "off"]."
|
||||||
return
|
return
|
||||||
|
|
||||||
|
/obj/item/weapon/extinguisher/examine(mob/user as mob)
|
||||||
|
..()
|
||||||
|
if(reagents.total_volume)
|
||||||
|
user << "It contains [round(reagents.total_volume)] units."
|
||||||
|
else
|
||||||
|
user << "It is empty."
|
||||||
|
|
||||||
/obj/item/weapon/extinguisher/proc/AttemptRefill(atom/target, mob/user)
|
/obj/item/weapon/extinguisher/proc/AttemptRefill(atom/target, mob/user)
|
||||||
if(istype(target, /obj/structure/reagent_dispensers/watertank) && target.Adjacent(user))
|
if(istype(target, /obj/structure/reagent_dispensers/watertank) && target.Adjacent(user))
|
||||||
var/safety_save = safety
|
var/safety_save = safety
|
||||||
|
|||||||
@@ -215,6 +215,8 @@ LINEN BINS
|
|||||||
|
|
||||||
|
|
||||||
/obj/structure/bedsheetbin/attack_hand(mob/user as mob)
|
/obj/structure/bedsheetbin/attack_hand(mob/user as mob)
|
||||||
|
if(user.lying)
|
||||||
|
return
|
||||||
if(amount >= 1)
|
if(amount >= 1)
|
||||||
amount--
|
amount--
|
||||||
|
|
||||||
|
|||||||
@@ -285,6 +285,8 @@
|
|||||||
|
|
||||||
/obj/structure/closet/attack_hand(mob/user as mob)
|
/obj/structure/closet/attack_hand(mob/user as mob)
|
||||||
src.add_fingerprint(user)
|
src.add_fingerprint(user)
|
||||||
|
if(user.lying && get_dist(src, user) > 0)
|
||||||
|
return
|
||||||
|
|
||||||
if(!src.toggle())
|
if(!src.toggle())
|
||||||
return src.attackby(null, user)
|
return src.attackby(null, user)
|
||||||
|
|||||||
@@ -163,7 +163,7 @@
|
|||||||
|
|
||||||
|
|
||||||
/obj/item/weapon/grown/nettle //abstract type
|
/obj/item/weapon/grown/nettle //abstract type
|
||||||
name = "abstract nettle"
|
name = "nettle"
|
||||||
desc = "It's probably <B>not</B> wise to touch it with bare hands..."
|
desc = "It's probably <B>not</B> wise to touch it with bare hands..."
|
||||||
icon = 'icons/obj/weapons.dmi'
|
icon = 'icons/obj/weapons.dmi'
|
||||||
icon_state = "nettle"
|
icon_state = "nettle"
|
||||||
@@ -211,7 +211,6 @@
|
|||||||
|
|
||||||
/obj/item/weapon/grown/nettle/basic
|
/obj/item/weapon/grown/nettle/basic
|
||||||
seed = /obj/item/seeds/nettleseed
|
seed = /obj/item/seeds/nettleseed
|
||||||
name = "nettle"
|
|
||||||
|
|
||||||
/obj/item/weapon/grown/nettle/basic/add_juice()
|
/obj/item/weapon/grown/nettle/basic/add_juice()
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -82,7 +82,7 @@
|
|||||||
else
|
else
|
||||||
W.loc = get_turf(src)
|
W.loc = get_turf(src)
|
||||||
W.layer = initial(W.layer)
|
W.layer = initial(W.layer)
|
||||||
W.dropped()
|
W.dropped(src)
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -35,8 +35,9 @@
|
|||||||
|
|
||||||
/mob/living/simple_animal/hostile/faithless/AttackingTarget()
|
/mob/living/simple_animal/hostile/faithless/AttackingTarget()
|
||||||
..()
|
..()
|
||||||
if(isliving(target))
|
if(iscarbon(target))
|
||||||
var/mob/living/L = target
|
var/mob/living/carbon/C = target
|
||||||
if(prob(12))
|
if(prob(12))
|
||||||
L.Weaken(3)
|
C.Weaken(3)
|
||||||
L.visible_message("<span class='danger'>\The [src] knocks down \the [L]!</span>")
|
C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
|
||||||
|
"<span class='userdanger'>\The [src] knocks you down!</span>")
|
||||||
@@ -114,10 +114,12 @@
|
|||||||
/mob/living/simple_animal/hostile/mimic/crate/AttackingTarget()
|
/mob/living/simple_animal/hostile/mimic/crate/AttackingTarget()
|
||||||
. =..()
|
. =..()
|
||||||
var/mob/living/L = .
|
var/mob/living/L = .
|
||||||
if(istype(L))
|
if(iscarbon(L))
|
||||||
|
var/mob/living/carbon/C = L
|
||||||
if(prob(15))
|
if(prob(15))
|
||||||
L.Weaken(2)
|
C.Weaken(2)
|
||||||
L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
|
C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
|
||||||
|
"<span class='userdanger'>\The [src] knocks you down!</span>")
|
||||||
|
|
||||||
//
|
//
|
||||||
// Copy Mimic
|
// Copy Mimic
|
||||||
@@ -206,11 +208,12 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
|
|||||||
/mob/living/simple_animal/hostile/mimic/copy/AttackingTarget()
|
/mob/living/simple_animal/hostile/mimic/copy/AttackingTarget()
|
||||||
..()
|
..()
|
||||||
if(knockdown_people)
|
if(knockdown_people)
|
||||||
if(isliving(target))
|
if(iscarbon(target))
|
||||||
var/mob/living/L = target
|
var/mob/living/carbon/C = target
|
||||||
if(prob(15))
|
if(prob(15))
|
||||||
L.Weaken(1)
|
C.Weaken(2)
|
||||||
L.visible_message("<span class='danger'>\The [src] knocks down \the [L]!</span>")
|
C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
|
||||||
|
"<span class='userdanger'>\The [src] knocks you down!</span>")
|
||||||
|
|
||||||
//
|
//
|
||||||
// Machine Mimics (Made by Malf AI)
|
// Machine Mimics (Made by Malf AI)
|
||||||
|
|||||||
@@ -39,11 +39,12 @@
|
|||||||
|
|
||||||
/mob/living/simple_animal/hostile/tree/AttackingTarget()
|
/mob/living/simple_animal/hostile/tree/AttackingTarget()
|
||||||
..()
|
..()
|
||||||
if(isliving(target))
|
if(iscarbon(target))
|
||||||
var/mob/living/L = target
|
var/mob/living/carbon/C = target
|
||||||
if(prob(15))
|
if(prob(15))
|
||||||
L.Weaken(3)
|
C.Weaken(3)
|
||||||
L.visible_message("<span class='danger'>\The [src] knocks down \the [L]!</span>")
|
C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
|
||||||
|
"<span class='userdanger'>\The [src] knocks you down!</span>")
|
||||||
|
|
||||||
/mob/living/simple_animal/hostile/tree/death(gibbed)
|
/mob/living/simple_animal/hostile/tree/death(gibbed)
|
||||||
..(1)
|
..(1)
|
||||||
|
|||||||
@@ -37,6 +37,8 @@
|
|||||||
|
|
||||||
|
|
||||||
/obj/item/weapon/paper_bin/attack_hand(mob/user)
|
/obj/item/weapon/paper_bin/attack_hand(mob/user)
|
||||||
|
if(user.lying)
|
||||||
|
return
|
||||||
if(amount >= 1)
|
if(amount >= 1)
|
||||||
amount--
|
amount--
|
||||||
update_icon()
|
update_icon()
|
||||||
|
|||||||
Reference in New Issue
Block a user