mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-29 16:10:02 +01:00
Fixes throat slitting being broken (#3232)
-fixes being unable to slit people's throat -fixes the sprite of make's custom item being wrong -fixes the infestation event using the incinerator area, something that don't seems to exist anymore, it is replaced with the waste disposal now
This commit is contained in:
@@ -68,8 +68,8 @@
|
||||
spawn_area_type = /area/engineering/atmos
|
||||
locstrings[numlocs] = "atmospherics"
|
||||
if(LOC_INCIN)
|
||||
spawn_area_type = /area/maintenance/incinerator
|
||||
locstrings[numlocs] = "the incinerator"
|
||||
spawn_area_type = /area/maintenance/disposal
|
||||
locstrings[numlocs] = "waste disposal"
|
||||
if(LOC_CHAPEL)
|
||||
spawn_area_type = /area/chapel/main
|
||||
locstrings[numlocs] = "the chapel"
|
||||
|
||||
@@ -151,6 +151,9 @@ emp_act
|
||||
..()
|
||||
|
||||
/mob/living/carbon/human/resolve_item_attack(obj/item/I, mob/living/user, var/target_zone)
|
||||
if(check_attack_throat(I, user))
|
||||
return null
|
||||
|
||||
if(user == src) // Attacking yourself can't miss
|
||||
return target_zone
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
Reference in New Issue
Block a user