From 908fc933f98b0de9f4df545b738fc2cba773d064 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 18 Nov 2016 19:03:56 -0200 Subject: [PATCH] Fixing more error and the return of banhammer (#10) --- code/datums/supplypacks.dm | 2 +- .../objects/items/robot/robot_upgrades.dm | 4 +-- code/game/objects/items/weapons/weaponry.dm | 31 +++++++++++++++++++ code/game/objects/random/random.dm | 4 +-- .../crates_lockers/closets/secure/security.dm | 1 - code/modules/clothing/under/jobs/security.dm | 1 - .../living/simple_animal/hostile/syndicate.dm | 2 +- 7 files changed, 37 insertions(+), 8 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 75e690b9259..ee245363000 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -776,7 +776,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee num_contained = 5 contains = list(/obj/item/clothing/suit/armor/vest, /obj/item/clothing/suit/armor/vest/security, - /obj/item/clothing/suit/armor/vest/detective, + /obj/item/clothing/suit/storage/vest/detective, /obj/item/clothing/suit/storage/vest/hos, /obj/item/clothing/suit/storage/vest/pcrc, /obj/item/clothing/suit/storage/vest/warden, diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 34d7cdde1ac..ac46f2beaa9 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -41,7 +41,7 @@ name = "robot reclassification board" desc = "Used to rename a cyborg." icon_state = "cyborg_upgrade1" - construction_cost = list(DEFAULT_WALL_MATERIAL=1000) +// construction_cost = list(DEFAULT_WALL_MATERIAL=1000) var/heldname = "default name" /obj/item/borg/upgrade/rename/attack_self(mob/user as mob) @@ -165,7 +165,7 @@ /obj/item/borg/upgrade/combat name = "combat cyborg module" desc = "Unlocks the combat cyborg module" - construction_cost = list(DEFAULT_WALL_MATERIAL=10000,"glass"=15000,"gold"= 5000,"diamond" = 1000) +// construction_cost = list(DEFAULT_WALL_MATERIAL=10000,"glass"=15000,"gold"= 5000,"diamond" = 1000) icon_state = "cyborg_upgrade3" require_module = 0 diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 6721a76e61e..d59d340735d 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -229,3 +229,34 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' contained_sprite = 1 + +/obj/item/weapon/sord + name = "\improper SORD" + desc = "This thing is so unspeakably shitty you are having a hard time even holding it." + icon_state = "sord" + item_state = "sord" + slot_flags = SLOT_BELT + force = 2 + throwforce = 1 + sharp = 1 + edge = 1 + w_class = 3 + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + hitsound = 'sound/weapons/bladeslice.ogg' + +/obj/item/weapon/banhammer + desc = "banhammer" + name = "banhammer" + icon = 'icons/obj/items.dmi' + icon_state = "toyhammer" + slot_flags = SLOT_BELT + throwforce = 0 + w_class = 2.0 + throw_speed = 7 + throw_range = 15 + attack_verb = list("banned") + +/obj/item/weapon/banhammer/attack(mob/M as mob, mob/user as mob) + M << " You have been banned FOR NO REISIN by [user]" + user << " You have BANNED [M]" + playsound(loc, 'sound/effects/adminhelp.ogg', 15) diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index cd739b769d0..3bad583fe4e 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -479,8 +479,8 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/brandy,\ /obj/item/weapon/reagent_containers/food/drinks/bottle/guinnes,\ /obj/item/weapon/reagent_containers/food/drinks/bottle/drambuie,\ - /obj/item/weapon/reagent_containers/food/drinks/cans/beer,\ - /obj/item/weapon/reagent_containers/food/drinks/cans/ale) + /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,\ + /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale) /obj/random/melee name = "random melee weapon" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 1a8b64ad2d7..dfd6659e89d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -256,7 +256,6 @@ new /obj/item/clothing/under/det(src) new /obj/item/clothing/under/det/grey(src) new /obj/item/clothing/under/det/black(src) - new /obj/item/clothing/under/det/slob(src) new /obj/item/clothing/suit/storage/det_suit(src) new /obj/item/clothing/suit/storage/det_suit/technicolor(src) new /obj/item/clothing/suit/storage/forensics/blue(src) diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 1849d3add49..baa96db005e 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -167,7 +167,6 @@ obj/item/clothing/head/det_hat/technicolor/attackby(obj/item/weapon/O as obj, mo name = "Head of Security hat" desc = "The hat of the Head of Security. For showing the officers who's in charge." icon_state = "hoscap" - flags = HEADCOVERSEYES armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0) flags_inv = HIDEEARS body_parts_covered = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 4268d6ad3e6..7f240e8a21e 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -107,7 +107,7 @@ rapid = 1 icon_state = "syndicateranged" icon_living = "syndicateranged" - casingtype = /obj/item/ammo_casing/a10mm + casingtype = /obj/item/ammo_casing/t40 projectilesound = 'sound/weapons/Gunshot_light.ogg' projectiletype = /obj/item/projectile/bullet/pistol/medium