cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 00:53:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Small bugfixes

Browse Source
This commit is contained in:
ZomgPonies
2013-12-29 17:04:18 -05:00
parent 04542065e5
commit 6bae66a53a
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks.dm
+13 -1
View File
@@ -1008,7 +1008,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
contains = list(/obj/item/weapon/vending_refill/boozeomat,
/obj/item/weapon/vending_refill/coffee)
cost = 15
containertype = /obj/structure/closet/crate
containername = "bartending supply crate"
group = "Operations"
/datum/supply_packs/organic/vending/snack
name = "Snack Supply Crate"
@@ -1016,27 +1018,35 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/weapon/vending_refill/snack,
/obj/item/weapon/vending_refill/snack)
cost = 15
containertype = /obj/structure/closet/crate
containername = "snacks supply crate"
group = "Operations"
/datum/supply_packs/organic/vending/cola
name = "Softdrinks Supply Crate"
contains = list(/obj/item/weapon/vending_refill/cola,
/obj/item/weapon/vending_refill/cola)
cost = 15
containertype = /obj/structure/closet/crate
containername = "softdrinks supply crate"
group = "Operations"
/datum/supply_packs/organic/vending/cigarette
name = "Cigarette Supply Crate"
contains = list(/obj/item/weapon/vending_refill/cigarette)
cost = 15
containertype = /obj/structure/closet/crate
containername = "cigarette supply crate"
group = "Operations"
/datum/supply_packs/misc/autodrobe
name = "Autodrobe Supply crate"
contains = list(/obj/item/weapon/vending_refill/autodrobe,
/obj/item/weapon/vending_refill/autodrobe)
cost = 15
containertype = /obj/structure/closet/crate
containername = "autodrobe supply crate"
group = "Operations"
/datum/supply_packs/misc/mafia
name = "Mafia Supply crate"
@@ -1044,4 +1054,6 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/clothing/head/fedora/brownfedora =1,/obj/item/clothing/head/fedora =1,/obj/item/clothing/under/flappers =1,/obj/item/clothing/under/mafia =1,/obj/item/clothing/under/mafia/vest =1,/obj/item/clothing/under/mafia/white =1,
/obj/item/clothing/under/mafia/sue =1,/obj/item/clothing/under/mafia/tan =1, /obj/item/toy/crossbow/tommygun =2,/obj/item/clothing/tie/accessory/gunholster =1,)
cost = 15
containername = "mafia supply crate"
containertype = /obj/structure/closet/crate
containername = "mafia supply crate"
group = "Operations"
code/game/objects/items/toys.dm
+1 -1
View File
@@ -246,7 +246,7 @@
for(var/mob/living/M in D.loc)
if(!istype(M,/mob/living)) continue
if(M == user) continue
D.visible_message("<span class='danger'>[] was hit by the foam dart!</span>")
D.visible_message("<span class='danger'>[M] was hit by the foam dart!</span>")
new /obj/item/toy/ammo/crossbow(M.loc)
del(D)
return