forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 68
obliterates the telescopic shield in favor of some cool buckler gauntlets #867
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
kittysmooch
wants to merge
17
commits into
DopplerShift13:master
Choose a base branch
from
kittysmooch:shield-me
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+124
−1
Open
Changes from 5 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
8785f8d
platillo means little plate in spanish yay
kittysmooch c9e3cb5
thanks unit tests!
kittysmooch 12ea700
Update special.dm
kittysmooch 96db4da
Merge branch 'master' into shield-me
kittysmooch f78d873
whoops
kittysmooch 876c14e
Update code/modules/research/designs/weapon_designs.dm
kittysmooch 5520b83
Update modular_doppler/modular_crafting/code/lathe_recipes.dm
kittysmooch d06166b
Update modular_doppler/modular_cosmetics/code/hands/special.dm
kittysmooch 1895fde
Update code/modules/research/techweb/nodes/security_nodes.dm
kittysmooch 16009b3
reproduces a bunch of shield code irresponsibly
kittysmooch 0ae1922
Merge branch 'master' into shield-me
kittysmooch f800549
slight buff because 25 block chance is almost 0 block chance against …
kittysmooch 53a5dbb
Merge branch 'master' into shield-me
kittysmooch 702e8a6
Update special.dm
kittysmooch cea33c7
Update special.dm
kittysmooch 5907280
Merge branch 'master' into shield-me
kittysmooch 4a51f8d
Merge branch 'master' into shield-me
kittysmooch File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Binary file modified
BIN
+436 Bytes
(120%)
modular_doppler/modular_cosmetics/icons/mob/hands/gloves.dmi
Binary file not shown.
Binary file modified
BIN
+464 Bytes
(120%)
modular_doppler/modular_cosmetics/icons/obj/hands/gloves.dmi
Binary file not shown.
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 |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /* | ||
| * for lathe recipes that aren't part of the colony kit stuff | ||
| */ | ||
|
|
||
| /datum/design/platillo_gauntlets | ||
| name = "\improper PA-4N Platillo shield gauntlets" | ||
| desc = "An armored gauntlet augmented with a thick buckler of plastitanium, from which it takes its officially designated name 'platillo'. \ | ||
| Meant primarily for melee combatants to wield two handed weapons without encumberance, the light coverage fares poorly under fire." | ||
kittysmooch marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| id = "platillo" | ||
| build_type = PROTOLATHE | AWAY_LATHE | ||
| materials = list( | ||
| /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, | ||
| /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3, | ||
| /datum/material/plasma = SMALL_MATERIAL_AMOUNT * 3, | ||
| ) | ||
| build_path = /obj/item/clothing/gloves/platillo | ||
| category = list( | ||
| RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_MELEE | ||
| ) | ||
| departmental_flags = DEPARTMENT_BITFLAG_SECURITY | ||
| autolathe_exportable = FALSE | ||
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
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.
Uh oh!
There was an error while loading. Please reload this page.