Some traitor uplink weapon changes #12244
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,7 +33,7 @@ | |
| caliber = CALIBER_HARPOON | ||
| ammo_type = /obj/item/ammo_casing/harpoon | ||
|
|
||
| /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow | ||
| name = "single round magazine" | ||
| max_ammo = 1 | ||
| caliber = CALIBER_REBAR | ||
|
|
@@ -42,13 +42,12 @@ | |
| /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/force | ||
| name = "two round magazine" | ||
| max_ammo = 2 | ||
| caliber = CALIBER_REBAR | ||
| ammo_type = /obj/item/ammo_casing/rebar | ||
|
|
||
| /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/syndie | ||
| caliber = CALIBER_REBAR | ||
| ammo_type = /obj/item/ammo_casing/rebar/syndie | ||
|
|
||
| /obj/item/ammo_box/magazine/internal/boltaction/minerjdj | ||
| name = "GIGANTIC RIFLE BREECH THAT SHOULD NOT EXIST" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,7 @@ | |
| cartridge_wording = "rod" | ||
| weapon_weight = WEAPON_HEAVY | ||
| initial_caliber = CALIBER_REBAR | ||
| accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow | ||
| recoil = 0 | ||
| fire_sound = 'sound/items/xbow_lock.ogg' | ||
| can_be_sawn_off = FALSE | ||
|
|
@@ -87,13 +87,12 @@ | |
| /obj/item/gun/ballistic/rifle/rebarxbow/syndie | ||
| name = "syndicate rebar crossbow" | ||
| desc = "The syndicate liked the bootleg rebar crossbow NT engineers made, so they showed what it could be if properly developed. \ | ||
| features a built in scope. Compatible with all known crossbow ammunition." | ||
| base_icon_state = "rebarxbowsyndie" | ||
| icon_state = "rebarxbowsyndie" | ||
| inhand_icon_state = "rebarxbowsyndie" | ||
| worn_icon_state = "rebarxbowsyndie" | ||
| w_class = WEIGHT_CLASS_NORMAL | ||
| draw_time = 1 | ||
| accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/syndie | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,7 +32,7 @@ | |
| icon_state = "rebar" | ||
| damage = 60 | ||
| dismemberment = 2 //It's a budget sniper rifle. | ||
| armour_penetration = 60 //A bit better versus armor. | ||
| wound_bonus = 10 | ||
| bare_wound_bonus = 20 | ||
| embed_falloff_tile = -3 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,7 @@ | |
|
|
||
| /datum/uplink_item/ammo/pistol | ||
| name = "9mm Magazine Case" | ||
| desc = "A case containing three additional 12-round 9mm magazines, compatible with the Makarov pistol, as well as \ | ||
| a box of loose 9mm ammunition." | ||
| item = /obj/item/storage/toolbox/guncase/traitor/ammunition | ||
| cost = 2 | ||
|
|
@@ -26,7 +26,7 @@ | |
|
|
||
| /datum/uplink_item/ammo/pistolap | ||
| name = "9mm Armour Piercing Magazine" | ||
| desc = "An additional 12-round 9mm magazine, compatible with the Makarov pistol. \ | ||
| These rounds are less effective at injuring the target but penetrate protective gear." | ||
| progression_minimum = 30 MINUTES | ||
| item = /obj/item/ammo_box/magazine/m9mm/ap | ||
|
|
@@ -35,7 +35,7 @@ | |
|
|
||
| /datum/uplink_item/ammo/pistolhp | ||
| name = "9mm Hollow Point Magazine" | ||
| desc = "An additional 12-round 9mm magazine, compatible with the Makarov pistol. \ | ||
| These rounds are more damaging but ineffective against armour." | ||
| progression_minimum = 30 MINUTES | ||
| item = /obj/item/ammo_box/magazine/m9mm/hp | ||
|
|
@@ -44,7 +44,7 @@ | |
|
|
||
| /datum/uplink_item/ammo/pistolfire | ||
| name = "9mm Incendiary Magazine" | ||
| desc = "An additional 12-round 9mm magazine, compatible with the Makarov pistol. \ | ||
| Loaded with incendiary rounds which inflict little damage, but ignite the target." | ||
| progression_minimum = 30 MINUTES | ||
| item = /obj/item/ammo_box/magazine/m9mm/fire | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,17 +49,17 @@ | |
| /datum/uplink_item/firearms/revolver | ||
| name = "Syndicate Revolver" | ||
| desc = "Waffle Co.'s modernized Syndicate revolver. Fires 7 brutal rounds of .357 Magnum." | ||
| item = /obj/item/storage/toolbox/guncase/traitor/revolver | ||
| progression_minimum = 30 MINUTES | ||
| cost = 12 | ||
| surplus = 50 | ||
| purchasable_from = ~UPLINK_CLOWN_OPS | ||
|
|
||
| /datum/uplink_item/firearms/rebarxbowsyndie | ||
| name = "Syndicate Rebar Crossbow" | ||
| desc = "A much more proffessional version of the engineer's bootleg rebar crossbow. Quicker loading, and better ammo. Owners manual included." | ||
| item = /obj/item/storage/box/syndie_kit/rebarxbowsyndie | ||
| cost = 8 | ||
|
|
||
| /datum/uplink_item/firearms/laser_musket | ||
| name = "Syndicate Laser Musket" | ||
|
|
@@ -99,12 +99,6 @@ | |
| item = /obj/item/storage/box/syndie_kit/shit_smg_bundle | ||
| cost = 4 | ||
|
|
||
|
Comment on lines
-102
to
-106
|
||
| /datum/uplink_item/firearms/slipstick | ||
| name = "Syndie Lipstick" | ||
| desc = "Stylish way to kiss to death, isn't it syndiekisser?" | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.