Merge pull request #8579 from Trilbyspaceclone/patch-171

Gives gangs a new shield and makes their boots cheaper
This commit is contained in:
kevinz000
2019-06-16 19:32:38 -07:00
committed by GitHub
2 changed files with 19 additions and 8 deletions
+11 -1
View File
@@ -20,7 +20,6 @@
attack_verb = list("shoved", "bashed")
var/cooldown = 0 //shield bash cooldown. based on world.time
/obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/melee/baton))
if(cooldown < world.time - 25)
@@ -166,3 +165,14 @@
block_chance = 25
force = 5
throwforce = 7
/obj/item/shield/riot/tower
name = "tower shield"
desc = "A massive shield that can block a lot of attacks, can take a lot of abuse before braking."
armor = list("melee" = 95, "bullet" = 95, "laser" = 75, "energy" = 60, "bomb" = 90, "bio" = 90, "rad" = 0, "fire" = 90, "acid" = 10) //Armor for the item, dosnt transfer to user
icon_state = "metal"
block_chance = 75 //1/4 shots will hit*
force = 10
slowdown = 2
throwforce = 15 //Massive pice of metal
w_class = WEIGHT_CLASS_HUGE
@@ -83,14 +83,12 @@
return
return TRUE
/datum/gang_item/clothing/hat
name = "Pimp Hat"
id = "hat"
cost = 16
item_path = /obj/item/clothing/head/collectable/petehat/gang
/obj/item/clothing/head/collectable/petehat/gang
name = "pimpin' hat"
desc = "The undisputed king of style."
@@ -109,7 +107,7 @@
/datum/gang_item/clothing/shoes
name = "Bling Boots"
id = "boots"
cost = 22
cost = 20
item_path = /obj/item/clothing/shoes/gang
/obj/item/clothing/shoes/gang
@@ -258,7 +256,6 @@ datum/gang_item/clothing/shades //Addition: Why not have cool shades on a gang m
/datum/gang_item/equipment
category = "Purchase Equipment:"
/datum/gang_item/equipment/spraycan
name = "Territory Spraycan"
id = "spraycan"
@@ -275,7 +272,6 @@ datum/gang_item/clothing/shades //Addition: Why not have cool shades on a gang m
cost = 3
item_path = /obj/item/sharpener
/datum/gang_item/equipment/emp
name = "EMP Grenade"
id = "EMP"
@@ -329,6 +325,12 @@ datum/gang_item/equipment/shield
cost = 25
item_path = /obj/item/shield/riot
datum/gang_item/equipment/gangsheild
name = "Tower Shield"
id = "metal"
cost = 45 //High block of melee and even higher for bullets
item_path = /obj/item/shield/riot/tower
/datum/gang_item/equipment/pen
name = "Recruitment Pen"
id = "pen"
@@ -352,7 +354,6 @@ datum/gang_item/equipment/shield
return "(GET ONE FREE)"
return ..()
/datum/gang_item/equipment/gangtool
id = "gangtool"
cost = 5
@@ -413,4 +414,4 @@ datum/gang_item/equipment/shield
/datum/gang_item/equipment/dominator/spawn_item(mob/living/carbon/user, datum/team/gang/gang, obj/item/device/gangtool/gangtool)
new item_path(user.loc)
to_chat(user, spawn_msg)
to_chat(user, spawn_msg)