Tons of new Mafia-theme stuff

This commit is contained in:
ZomgPonies
2013-12-29 14:30:29 -05:00
parent e75a51026d
commit 04542065e5
22 changed files with 133 additions and 9 deletions
+8
View File
@@ -1037,3 +1037,11 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/weapon/vending_refill/autodrobe)
cost = 15
containername = "autodrobe supply crate"
/datum/supply_packs/misc/mafia
name = "Mafia Supply crate"
contains = list(/obj/item/clothing/suit/browntrenchcoat =1,/obj/item/clothing/suit/blacktrenchcoat =1,/obj/item/clothing/head/fedora/whitefedora =1,
/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"
+1
View File
@@ -12,6 +12,7 @@
/obj/item/toy/crossbow = 2,
/obj/item/weapon/storage/fancy/crayons = 2,
/obj/item/toy/spinningtoy = 2,
/obj/item/toy/crossbow/tommygun = 2,
/obj/item/toy/prize/ripley = 1,
/obj/item/toy/prize/fireripley = 1,
/obj/item/toy/prize/deathripley = 1,
+30 -6
View File
@@ -5,6 +5,7 @@
* Fake singularity
* Toy gun
* Toy crossbow
* Toy Tommy Gun
* Toy swords
* Crayons
* Snap pops
@@ -245,8 +246,7 @@
for(var/mob/living/M in D.loc)
if(!istype(M,/mob/living)) continue
if(M == user) continue
for(var/mob/O in viewers(world.view, D))
O.show_message(text("\red [] was hit by the foam dart!", M), 1)
D.visible_message("<span class='danger'>[] was hit by the foam dart!</span>")
new /obj/item/toy/ammo/crossbow(M.loc)
del(D)
return
@@ -267,8 +267,8 @@
return
else if (bullets == 0)
user.Weaken(5)
for(var/mob/O in viewers(world.view, user))
O.show_message(text("\red [] realized they were out of ammo and starting scrounging for some!", user), 1)
user.visible_message("<span class='danger'>[] realized they were out of ammo and starting scrounging for some!</span>")
attack(mob/M as mob, mob/user as mob)
@@ -280,7 +280,7 @@
for(var/mob/O in viewers(M, null))
if(O.client)
O.show_message(text("\red <B>[] casually lines up a shot with []'s head and pulls the trigger!</B>", user, M), 1, "\red You hear the sound of foam against skull", 2)
O.show_message(text("<span class='danger'><B>[] casually lines up a shot with []'s head and pulls the trigger!</B></span>", user, M), 1, "<span class='danger'>You hear the sound of foam against skull.</span>", 2)
O.show_message(text("\red [] was hit in the head by the foam dart!", M), 1)
playsound(user.loc, 'sound/items/syringeproj.ogg', 50, 1)
@@ -288,7 +288,7 @@
src.bullets--
else if (M.lying && src.bullets == 0)
for(var/mob/O in viewers(M, null))
if (O.client) O.show_message(text("\red <B>[] casually lines up a shot with []'s head, pulls the trigger, then realizes they are out of ammo and drops to the floor in search of some!</B>", user, M), 1, "\red You hear someone fall", 2)
if (O.client) O.show_message(text("<span class='danger'><B>[] casually lines up a shot with []'s head, pulls the trigger, then realizes they are out of ammo and drops to the floor in search of some!</B></span>", user, M), 1, "<span class='danger'>You hear someone fall.</span>", 2)
user.Weaken(5)
return
@@ -309,6 +309,30 @@
density = 0
/*
* Tommy gun
*/
/obj/item/toy/crossbow/tommygun
name = "tommy gun"
desc = "Looks almost like the real thing! Great for practicing Drive-bys"
icon_state = "tommy"
item_state = "tommy"
flags = FPRINT | TABLEPASS| CONDUCT
w_class = 1.0
attack_verb = list("struck", "hammered", "hit", "bashed")
bullets = 20.0
/obj/item/toy/crossbow/tommygun/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I, /obj/item/toy/ammo/crossbow))
if(bullets <= 19)
user.drop_item()
del(I)
bullets++
user << "<span class='notice'>You load the foam dart into the tommy gun.</span>"
else
user << "<span class='danger'>It's already fully loaded.</span>"
/*
* Toy swords
*/
+11 -1
View File
@@ -13,4 +13,14 @@
suicide_act(mob/user)
viewers(user) << "\red <b>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
return (OXYLOSS)
return (OXYLOSS)
/obj/item/weapon/melee/icepick
name = "ice pick"
desc = "Used for chopping ice. Also excellent for mafia esque murders."
icon_state = "icepick"
item_state = "icepick"
force = 15
throwforce = 10
w_class = 2
attack_verb = list("stabbed", "jabbed", "iced,")
@@ -281,6 +281,7 @@
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/head/det_hat(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/tie/accessory/gunholster(src)
new /obj/item/weapon/storage/box/evidence(src)
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/detective_scanner(src)
+15 -1
View File
@@ -261,4 +261,18 @@
icon_state = "crown"
item_state = "crown"
desc = "A gliterring bananium crown with spessjewels in it. Swaggy."
flags = FPRINT | TABLEPASS | BLOCKHAIR
flags = FPRINT | TABLEPASS | BLOCKHAIR
/obj/item/clothing/head/fedora
name = "fedora"
desc = "Someone wearing this definitely makes them cool"
icon_state = "fedora"
/obj/item/clothing/head/fedora/whitefedora
name = "white fedora"
icon_state = "wfedora"
/obj/item/clothing/head/fedora/brownfedora
name = "brown fedora"
icon_state = "bfedora"
@@ -266,6 +266,19 @@
item_state = "neocoat"
flags = FPRINT | TABLEPASS
/obj/item/clothing/suit/browntrenchcoat
name = "brown trench coat"
desc = "It makes you stand out. Just the opposite of why it's typically worn. Nice try trying to blend in while wearing it."
icon_state = "brtrenchcoat"
item_state = "brtrenchcoat"
/obj/item/clothing/suit/blacktrenchcoat
name = "black trench coat"
desc = "That shade of black just makes you look a bit more evil. Good for those mafia types."
icon_state = "bltrenchcoat"
item_state = "bltrenchcoat"
//actual suits
/obj/item/clothing/suit/creamsuit
@@ -387,3 +387,45 @@
item_state = "meido"
_color = "meido"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/flappers
name = "flappers"
desc = "Nothing like the roarin' '20s, flapping the night away on the dance floor."
icon_state = "flapper"
item_state = "flapper"
_color = "flapper"
/obj/item/clothing/under/mafia
name = "mafia outfit"
desc = "The business of the mafia is business."
icon_state = "mafia"
item_state = "mafia"
_color = "mafia"
/obj/item/clothing/under/mafia/vest
name = "mafia vest"
desc = "Extreme problems often require extreme solutions."
icon_state = "mafiavest"
item_state = "mafiavest"
_color = "mafiavest"
/obj/item/clothing/under/mafia/white
name = "white mafia outfit"
desc = "The best defense against the treacherous is treachery."
icon_state = "mafiawhite"
item_state = "mafiawhite"
_color = "mafiawhite"
/obj/item/clothing/under/mafia/sue
name = "mafia vest"
desc = "The business is born into."
icon_state = "suevest"
item_state = "suevest"
_color = "suevest"
/obj/item/clothing/under/mafia/tan
name = "leather mafia outfit"
desc = "The big drum sounds good only from a distance."
icon_state = "mafiatan"
item_state = "mafiatan"
_color = "mafiatan"
+12 -1
View File
@@ -334,4 +334,15 @@
/obj/item/clothing/tie/storage/knifeharness/New()
..()
new /obj/item/weapon/hatchet/unathiknife(hold)
new /obj/item/weapon/hatchet/unathiknife(hold)
new /obj/item/weapon/hatchet/unathiknife(hold)
/////////////////
//Miscellaneous//
/////////////////
/obj/item/clothing/tie/accessory/gunholster
name = "gun holster"
desc = "When you just HAVE to show off your guns"
icon_state = "gunhulster"
_color = "gunhulster"