- 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:
phil235
2015-05-02 01:34:38 +02:00
parent 64b5f8540c
commit be1708483e
11 changed files with 40 additions and 21 deletions
+1 -2
View File
@@ -163,7 +163,7 @@
/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..."
icon = 'icons/obj/weapons.dmi'
icon_state = "nettle"
@@ -211,7 +211,6 @@
/obj/item/weapon/grown/nettle/basic
seed = /obj/item/seeds/nettleseed
name = "nettle"
/obj/item/weapon/grown/nettle/basic/add_juice()
..()
+1 -1
View File
@@ -82,7 +82,7 @@
else
W.loc = get_turf(src)
W.layer = initial(W.layer)
W.dropped()
W.dropped(src)
return 0
@@ -35,8 +35,9 @@
/mob/living/simple_animal/hostile/faithless/AttackingTarget()
..()
if(isliving(target))
var/mob/living/L = target
if(iscarbon(target))
var/mob/living/carbon/C = target
if(prob(12))
L.Weaken(3)
L.visible_message("<span class='danger'>\The [src] knocks down \the [L]!</span>")
C.Weaken(3)
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()
. =..()
var/mob/living/L = .
if(istype(L))
if(iscarbon(L))
var/mob/living/carbon/C = L
if(prob(15))
L.Weaken(2)
L.visible_message("<span class='danger'>\the [src] knocks down \the [L]!</span>")
C.Weaken(2)
C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
"<span class='userdanger'>\The [src] knocks you down!</span>")
//
// 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()
..()
if(knockdown_people)
if(isliving(target))
var/mob/living/L = target
if(iscarbon(target))
var/mob/living/carbon/C = target
if(prob(15))
L.Weaken(1)
L.visible_message("<span class='danger'>\The [src] knocks down \the [L]!</span>")
C.Weaken(2)
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)
@@ -39,11 +39,12 @@
/mob/living/simple_animal/hostile/tree/AttackingTarget()
..()
if(isliving(target))
var/mob/living/L = target
if(iscarbon(target))
var/mob/living/carbon/C = target
if(prob(15))
L.Weaken(3)
L.visible_message("<span class='danger'>\The [src] knocks down \the [L]!</span>")
C.Weaken(3)
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)
..(1)
+2
View File
@@ -37,6 +37,8 @@
/obj/item/weapon/paper_bin/attack_hand(mob/user)
if(user.lying)
return
if(amount >= 1)
amount--
update_icon()