From 08f78d7db92595a7fe6a8a5227562b9e94527179 Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Wed, 9 Mar 2016 23:02:18 -0800 Subject: [PATCH 1/3] adds reinforced bolas, tweaks uplink throwing star bundle adds reinforced bolas, they do a Weaken(1) and take twice as long to break out of when compared to normal ones. their sprite has a different color moves throwing star bundle to uplink_kits.dm from weaponry.dm and makes it use a syndicate box tweaked the throwing star bundle to be the throwing weapon bundle, updated uplink listing and description accordingly lowered throwing weapon bundle cost to 5 from 6 --- code/game/objects/items/weapons/handcuffs.dm | 11 +++++++++++ .../items/weapons/storage/uplink_kits.dm | 15 ++++++++++++++- code/game/objects/items/weapons/weaponry.dm | 12 ------------ code/modules/uplink/uplink_item.dm | 12 ++++++------ icons/obj/items.dmi | Bin 51393 -> 51624 bytes 5 files changed, 31 insertions(+), 19 deletions(-) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 955733fee2a..b742a2a228e 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -287,14 +287,25 @@ icon_state = "bola" breakouttime = 35//easy to apply, easy to break out of gender = NEUTER + var/stun = 0 /obj/item/weapon/restraints/legcuffs/bola/throw_impact(atom/hit_atom) if(..() || !iscarbon(hit_atom))//if it gets caught or the target can't be cuffed, return//abort var/mob/living/carbon/C = hit_atom if(!C.legcuffed) + visible_message("\The [src] ensnares [C]!") C.legcuffed = src src.loc = C C.update_inv_legcuffed() feedback_add_details("handcuffs","B") C << "\The [src] ensnares you!" + if(stun) + C.Weaken(1) + +/obj/item/weapon/restraints/legcuffs/bola/tactical//traitor variant + name = "reinforced bola" + desc = "A strong bola, made with a long steel chain. It looks heavy, enough so that it could trip somebody." + icon_state = "bola_r" + breakouttime = 70 + stun = 1 \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index fd68e7bf3ca..3dc9209938a 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -260,4 +260,17 @@ new /obj/item/device/radio/headset/chameleon(src) new /obj/item/weapon/stamp/chameleon(src) new /obj/item/device/pda/chameleon(src) - new /obj/item/weapon/gun/energy/laser/chameleon(src) \ No newline at end of file + new /obj/item/weapon/gun/energy/laser/chameleon(src) + +//5*(2*4) = 5*8 = 45, 45 damage if you hit one person with all 5 stars. +//Not counting the damage it will do while embedded (2*4 = 8, at 15% chance) +/obj/item/weapon/storage/box/syndie_kit/throwing_weapons/New() + ..() + contents = list() + new /obj/item/weapon/throwing_star(src) + new /obj/item/weapon/throwing_star(src) + new /obj/item/weapon/throwing_star(src) + new /obj/item/weapon/throwing_star(src) + new /obj/item/weapon/throwing_star(src) + new /obj/item/weapon/restraints/legcuffs/bola/tactical(src) + new /obj/item/weapon/restraints/legcuffs/bola/tactical(src) \ No newline at end of file diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index ea174df13f2..483f1fc85fd 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -130,18 +130,6 @@ sharpness = IS_SHARP materials = list(MAT_METAL=500, MAT_GLASS=500) -//5*(2*4) = 5*8 = 45, 45 damage if you hit one person with all 5 stars. -//Not counting the damage it will do while embedded (2*4 = 8, at 15% chance) -/obj/item/weapon/storage/box/throwing_stars/New() - ..() - contents = list() - new /obj/item/weapon/throwing_star(src) - new /obj/item/weapon/throwing_star(src) - new /obj/item/weapon/throwing_star(src) - new /obj/item/weapon/throwing_star(src) - new /obj/item/weapon/throwing_star(src) - - /obj/item/weapon/switchblade name = "switchblade" diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index 685fb69e0b0..d6b547e0acc 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -513,12 +513,12 @@ var/list/uplink_items = list() // Global list so we only initialize this once. cost = 17 exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang) -/datum/uplink_item/stealthy_weapons/throwingstars - name = "Box of Throwing Stars" - desc = "A box of shurikens from ancient Earth martial arts. They are highly effective throwing weapons, \ - and will embed into limbs when possible." - item = /obj/item/weapon/storage/box/throwing_stars - cost = 6 +/datum/uplink_item/stealthy_weapons/throwingweapons + name = "Box of Throwing Weapons" + desc = "A box of shurikens and reinforced bolas from ancient Earth martial arts. They are highly effective \ + throwing weapons. The bolas can knock a target down and the shirukens will embed into limbs." + item = /obj/item/weapon/storage/box/syndie_kit/throwing_weapons + cost = 5 /datum/uplink_item/stealthy_weapons/edagger name = "Energy Dagger" diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 59eb1451d27b654a917e6379e014ba5e92a6f1fc..94e8ccc97785e7e308aae8074d8ae15562f45e24 100644 GIT binary patch delta 12941 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 delta 12708 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 @pdhuF%)RnTTz$r@PQRhaKNk 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 R;v>L6@8wiwE2YhX{tvJ*XPp25 From 391f761ac9262c995549e187328faab5d0cb34b8 Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Thu, 10 Mar 2016 12:26:35 -0800 Subject: [PATCH 2/3] maybe fixes metastation --- _maps/map_files/MetaStation/MetaStation.v41I.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.v41I.dmm b/_maps/map_files/MetaStation/MetaStation.v41I.dmm index 6aafc048227..08c57490c65 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41I.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41I.dmm @@ -230,7 +230,7 @@ "aev" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{name = "Prison Sanitarium"; req_access_txt = "2"},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "red"; dir = 1},/area/security/prison) "aew" = (/turf/simulated/wall/r_wall,/area/ai_monitored/security/armory) "aex" = (/obj/structure/rack,/obj/item/weapon/gun/energy/ionrifle{pin = /obj/item/device/firing_pin},/obj/item/clothing/suit/armor/laserproof,/obj/machinery/light{dir = 1},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/ai_monitored/security/armory) -"aey" = (/obj/structure/closet/secure_closet{name = "contraband locker"; req_access_txt = "3"},/obj/effect/spawner/lootdrop/maintenance{lootcount = 3; name = "3maintenance loot spawner"},/obj/effect/spawner/lootdrop/armory_contraband{loot = list(/obj/item/weapon/gun/projectile/automatic/pistol = 5, /obj/item/weapon/gun/projectile/shotgun/automatic/combat = 5, /obj/item/weapon/gun/projectile/revolver/mateba, /obj/item/weapon/gun/projectile/automatic/pistol/deagle, /obj/item/weapon/storage/box/throwing_stars = 3)},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/ai_monitored/security/armory) +"aey" = (/obj/structure/closet/secure_closet{name = "contraband locker"; req_access_txt = "3"},/obj/effect/spawner/lootdrop/maintenance{lootcount = 3; name = "3maintenance loot spawner"},/obj/effect/spawner/lootdrop/armory_contraband{loot = list(/obj/item/weapon/gun/projectile/automatic/pistol = 5, /obj/item/weapon/gun/projectile/shotgun/automatic/combat = 5, /obj/item/weapon/gun/projectile/revolver/mateba, /obj/item/weapon/gun/projectile/automatic/pistol/deagle, /obj/item/weapon/storage/box/syndie_kit/throwing_weapons = 3)},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/ai_monitored/security/armory) "aez" = (/obj/structure/table/wood,/obj/machinery/newscaster/security_unit{pixel_x = 0; pixel_y = 32},/obj/item/weapon/folder/red,/obj/item/weapon/folder/red,/obj/machinery/keycard_auth{pixel_x = -26; pixel_y = 23},/obj/machinery/button/door{id = "hosspace"; name = "Space Shutters Control"; pixel_x = -26; pixel_y = 34},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) "aeA" = (/obj/machinery/computer/prisoner,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) "aeB" = (/obj/machinery/computer/security,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/hos) @@ -4178,7 +4178,7 @@ "bCr" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/condiment/saltshaker{pixel_x = -3; pixel_y = 0},/obj/item/weapon/reagent_containers/food/condiment/peppermill{pixel_x = 3},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) "bCs" = (/obj/machinery/smartfridge/drinks{icon_state = "boozeomat"},/turf/simulated/wall,/area/crew_quarters/bar) "bCt" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/table/wood/poker,/obj/item/toy/cards/deck{pixel_y = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) -"bCu" = (/obj/structure/table/wood/poker,/obj/effect/spawner/lootdrop{loot = list(/obj/item/weapon/gun/projectile/revolver/russian = 5, /obj/item/weapon/storage/box/throwing_stars, /obj/item/toy/cards/deck/syndicate = 2); name = "gambling valuables spawner"},/turf/simulated/floor/wood,/area/crew_quarters/bar) +"bCu" = (/obj/structure/table/wood/poker,/obj/effect/spawner/lootdrop{loot = list(/obj/item/weapon/gun/projectile/revolver/russian = 5, /obj/item/weapon/storage/box/syndie_kit/throwing_weapons, /obj/item/toy/cards/deck/syndicate = 2); name = "gambling valuables spawner"},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bCv" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/chair/stool{pixel_y = 8},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bCw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) "bCx" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; initialize_directions = 11},/turf/simulated/floor/carpet,/area/crew_quarters/theatre) From 3be53bb7a47183566388c9e558bf0a81788e0f5d Mon Sep 17 00:00:00 2001 From: PKPenguin321 Date: Thu, 10 Mar 2016 19:33:54 -0800 Subject: [PATCH 3/3] changes var for bola stunning now instead of a TRUE/FALSE toggle, it's the actual amount of Weaken() applied. default is 0 (no stun) also fixes small typo in uplink_item.dm --- code/game/objects/items/weapons/handcuffs.dm | 7 +++---- code/modules/uplink/uplink_item.dm | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index b742a2a228e..a526ea5644c 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -287,7 +287,7 @@ icon_state = "bola" breakouttime = 35//easy to apply, easy to break out of gender = NEUTER - var/stun = 0 + var/weaken = 0 /obj/item/weapon/restraints/legcuffs/bola/throw_impact(atom/hit_atom) if(..() || !iscarbon(hit_atom))//if it gets caught or the target can't be cuffed, @@ -300,12 +300,11 @@ C.update_inv_legcuffed() feedback_add_details("handcuffs","B") C << "\The [src] ensnares you!" - if(stun) - C.Weaken(1) + C.Weaken(weaken) /obj/item/weapon/restraints/legcuffs/bola/tactical//traitor variant name = "reinforced bola" desc = "A strong bola, made with a long steel chain. It looks heavy, enough so that it could trip somebody." icon_state = "bola_r" breakouttime = 70 - stun = 1 \ No newline at end of file + weaken = 1 \ No newline at end of file diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index d6b547e0acc..97cd1eea830 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -516,7 +516,7 @@ var/list/uplink_items = list() // Global list so we only initialize this once. /datum/uplink_item/stealthy_weapons/throwingweapons name = "Box of Throwing Weapons" desc = "A box of shurikens and reinforced bolas from ancient Earth martial arts. They are highly effective \ - throwing weapons. The bolas can knock a target down and the shirukens will embed into limbs." + throwing weapons. The bolas can knock a target down and the shurikens will embed into limbs." item = /obj/item/weapon/storage/box/syndie_kit/throwing_weapons cost = 5