mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 15:45:25 +01:00
Commit for Giacom:
Breaking bottles over people's heads! - The bottle will be destroyed and a broken bottle will replace the old bottle - There is a chance for a glass shard to be created - The regents of the bottle get splashed onto the mob who got hit - This affects alcoholic bottles, not to be confused with pill bottles or chemistry bottles. - - Technically milk cartons and lime juice cartons, so they break as if they're glass. Names in the PDA list are now ordered alphabetically. Changelog updated git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3998 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -347,7 +347,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
|
||||
var/count = 0
|
||||
|
||||
if (!toff)
|
||||
for (var/obj/item/device/pda/P in PDAs)
|
||||
for (var/obj/item/device/pda/P in sortList(PDAs))
|
||||
if (!P.owner||P.toff||P == src) continue
|
||||
dat += "<li><a href='byond://?src=\ref[src];choice=Message;target=\ref[P]'>[P]</a>"
|
||||
if (istype(cartridge, /obj/item/weapon/cartridge/syndicate) && !istype(P, /obj/item/device/pda/ai))
|
||||
|
||||
@@ -524,6 +524,7 @@
|
||||
istype(W, /obj/item/weapon/scalpel) || \
|
||||
istype(W, /obj/item/weapon/kitchen/utensil/knife) || \
|
||||
istype(W, /obj/item/weapon/shard) || \
|
||||
istype(W, /obj/item/weapon/broken_bottle) || \
|
||||
istype(W, /obj/item/weapon/reagent_containers/syringe) || \
|
||||
istype(W, /obj/item/weapon/kitchen/utensil/fork) && W.icon_state != "forkloaded" || \
|
||||
istype(W, /obj/item/weapon/twohanded/fireaxe) \
|
||||
|
||||
Reference in New Issue
Block a user