mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
Remove SpeciesCanConsume() proc, replaced by iscarbon checks.
Remove alloweat var from masks, remove MASKCOVERSMOUTH flag from mime and clown masks so you can still eat through them. Some adjustments in surgery checks for bodyparts covered. Fixes a runtime in weapon/energy attack_verb. Humans can now CPR monkeys. Slight changes to CPR code. Fixes runtime with drones trying to do CPR. Rewrites /obj/item/weapon/reagent_containers/proc/canconsume to be less shitty. Adds an is_mouth_covered() proc to carbons to check for mask and headgear with MASKCOVERSMOUTH or HEADCOVERSMOUTH, with argument to restrict the check to only mask or only head.
This commit is contained in:
@@ -50,6 +50,9 @@
|
||||
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
if(H.is_mouth_covered())
|
||||
user << "<span class='notice'>Remove [ H == user ? "your" : "their" ] mask!</span>"
|
||||
return
|
||||
if(H.lip_style) //if they already have lipstick on
|
||||
user << "<span class='notice'>You need to wipe off the old lipstick first!</span>"
|
||||
return
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
var/force_on = 30 //force when active
|
||||
var/throwforce_on = 20
|
||||
var/icon_state_on = "axe1"
|
||||
var/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
|
||||
var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
|
||||
w_class = 2
|
||||
var/w_class_on = 4
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
flags = CONDUCT | NOSHIELD
|
||||
origin_tech = "combat=3"
|
||||
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
|
||||
attack_verb_on = null
|
||||
attack_verb_on = list()
|
||||
|
||||
/obj/item/weapon/melee/energy/axe/suicide_act(mob/user)
|
||||
user.visible_message("<span class='suicide'>[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide.</span>")
|
||||
@@ -47,7 +47,6 @@
|
||||
throw_speed = 3
|
||||
throw_range = 5
|
||||
flags = NOSHIELD
|
||||
attack_verb = null
|
||||
origin_tech = "magnets=3;syndicate=4"
|
||||
var/hacked = 0
|
||||
|
||||
@@ -69,7 +68,7 @@
|
||||
force = force_on
|
||||
throwforce = throwforce_on
|
||||
hitsound = 'sound/weapons/blade1.ogg'
|
||||
if(attack_verb_on)
|
||||
if(attack_verb_on.len)
|
||||
attack_verb = attack_verb_on
|
||||
if(!item_color)
|
||||
icon_state = icon_state_on
|
||||
@@ -82,7 +81,8 @@
|
||||
force = initial(force)
|
||||
throwforce = initial(throwforce)
|
||||
hitsound = initial(hitsound)
|
||||
attack_verb = initial(attack_verb)
|
||||
if(attack_verb_on.len)
|
||||
attack_verb = list()
|
||||
icon_state = initial(icon_state)
|
||||
w_class = initial(w_class)
|
||||
playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) //changed it from 50% volume to 35% because deafness
|
||||
|
||||
Reference in New Issue
Block a user