-
Notifications
You must be signed in to change notification settings - Fork 131
New craftable/improvised SMG, the 'Greaser' (Namespaces Fixed) #346
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
NotoriousCapone
wants to merge
9
commits into
ProjectOmu:master
Choose a base branch
from
NotoriousCapone:CraftableGreaseGun
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.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
0308549
New AND Craftable sub machine gun 'Greaser'
NotoriousCapone 5c29f33
Merge branch 'master' into CraftableGreaseGun
NotoriousCapone e6c85b8
New craftable/improvised SMG, the 'Greaser'
NotoriousCapone 85b4c3e
Merge branch 'CraftableGreaseGun' of https://github.com/NotoriousCapo…
NotoriousCapone 2cf706a
Changed namespace of tag to Omu's
NotoriousCapone dbcb07d
Final namespace fix + Small space
NotoriousCapone d8ed1ad
Merge branch 'master' into CraftableGreaseGun
Cygnye fcac768
Merge branch 'master' into CraftableGreaseGun
RichardBlonski 17f09ea
Merge branch 'master' into CraftableGreaseGun
NotActuallyMarty 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
Binary file not shown.
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 |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| construction-graph-tag-lubricant = Space Lube | ||
|
|
||
| construction-graph-tag-chem-hud = chemical analysis goggles | ||
| construction-graph-tag-medichem-hud = medichem goggles |
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 |
|---|---|---|
|
|
@@ -216,3 +216,4 @@ | |
| targetNode: bagPet | ||
| category: construction-category-clothing | ||
| objectType: Item | ||
|
|
||
79 changes: 79 additions & 0 deletions
79
Resources/Prototypes/_Omu/Entities/Objects/Misc/greaser.yml
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,79 @@ | ||
| - type: entity | ||
| name: Uncut Steel Frame | ||
| parent: BaseItem | ||
| id: GreaseGunFrame | ||
| description: A crude, rectangular hunk of station steel. Nothing’s drilled, nothing’s fitted. Just raw potential and bad intentions. | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Omu/Objects/Weapons/Guns/SMGs/greaser.rsi | ||
| state: construction-1 | ||
| - type: Item | ||
| size: Normal | ||
| sprite: | ||
| - type: Construction | ||
| graph: GreaserGraph | ||
| node: greaserframe | ||
|
|
||
| - type: entity | ||
| name: Rough-Bored Receiver | ||
| parent: BaseItem | ||
| id: MachinedGreaseGunFrame | ||
| description: A roughly machined receiver shell. The metal’s uneven, crude, and filed by hand, but the shape of a gun is finally showing itself. | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Omu/Objects/Weapons/Guns/SMGs/greaser.rsi | ||
| state: construction-2 | ||
| - type: Item | ||
| size: Normal | ||
| sprite: _Omu/Objects/Weapons/Guns/SMGs/greaser.rsi | ||
| - type: Construction | ||
| graph: GreaserGraph | ||
| node: greasermachinedframe | ||
|
|
||
| - type: entity | ||
| name: Bolt-Fitted Receiver | ||
| parent: BaseItem | ||
| id: GreaseGunBoltAssembly | ||
| description: The bolt’s slapped in and welded shut. Lords' lore says if it rattles, it’ll run—this one rattles like hell. | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Omu/Objects/Weapons/Guns/SMGs/greaser.rsi | ||
| state: construction-3 | ||
| - type: Item | ||
| size: Normal | ||
| sprite: _Omu/Objects/Weapons/Guns/SMGs/greaser.rsi | ||
| - type: Construction | ||
| graph: GreaserGraph | ||
| node: greaserboltwelded | ||
|
|
||
| - type: entity | ||
| name: Wired-Up Lower Rig | ||
| parent: BaseItem | ||
| id: GreaseGunLowerAssembly | ||
| description: The lower assembly is wired, screwed, and half-aligned. The trigger crunches like a mousetrap. One or two more steps and this thing might actually fire. | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Omu/Objects/Weapons/Guns/SMGs/greaser.rsi | ||
| state: construction-4 | ||
| - type: Item | ||
| size: Normal | ||
| sprite: _Omu/Objects/Weapons/Guns/SMGs/greaser.rsi | ||
| - type: Construction | ||
| graph: GreaserGraph | ||
| node: greaserlowerassembly | ||
|
|
||
| - type: entity | ||
| name: Nearly-Ready Greaser | ||
| parent: BaseItem | ||
| id: GreaseGunBarrel | ||
| description: Every part of the gun is now bolted together; Barrel, bolt, frame, and trigger. It just needs some minor adjustments and, of course, grease. | ||
| components: | ||
| - type: Sprite | ||
| sprite: _Omu/Objects/Weapons/Guns/SMGs/greaser.rsi | ||
| state: construction-5 | ||
| - type: Item | ||
| size: Normal | ||
| sprite: _Omu/Objects/Weapons/Guns/SMGs/greaser.rsi | ||
| - type: Construction | ||
| graph: GreaserGraph | ||
| node: greaserbarrel |
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
103 changes: 103 additions & 0 deletions
103
Resources/Prototypes/_Omu/Recipes/Crafting/Graphs/improvised/greaser.yml
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,103 @@ | ||
| - type: constructionGraph | ||
| id: GreaserGraph | ||
| start: start | ||
| graph: | ||
| - node: start | ||
| edges: | ||
| - to: greaserframe | ||
| steps: | ||
| - tag: ModularReceiver | ||
| icon: | ||
| sprite: Objects/Misc/modular_receiver.rsi | ||
| state: icon | ||
| name: construction-graph-tag-modular-receiver | ||
| - material: Steel | ||
| amount: 20 | ||
| doAfter: 10 | ||
|
|
||
| - node: greaserframe | ||
| entity: GreaseGunFrame | ||
| edges: | ||
| - to: machinedgreaserframe | ||
| steps: | ||
| - tool: Screwing | ||
| doAfter: 15 | ||
|
|
||
| - node: machinedgreaserframe | ||
| entity: MachinedGreaseGunFrame | ||
| edges: | ||
| - to: greaserboltunwelded | ||
| steps: | ||
| - material: MetalRod | ||
| amount: 6 | ||
| doAfter: 10 | ||
|
|
||
| - node: greaserboltunwelded | ||
| entity: MachinedGreaseGunFrame | ||
| edges: | ||
| - to: greaserboltwelded | ||
| steps: | ||
| - tool: Welding | ||
| doAfter: 10 | ||
|
|
||
| - node: greaserboltwelded | ||
| entity: GreaseGunBoltAssembly | ||
| edges: | ||
| - to: greaserlowerassembly | ||
| steps: | ||
| - material: Steel | ||
| amount: 10 | ||
| doAfter: 15 | ||
|
|
||
| - node: greaserlowerassembly | ||
| entity: GreaseGunLowerAssembly | ||
| edges: | ||
| - to: greasertriggergroup | ||
| steps: | ||
| - tool: Screwing | ||
| doAfter: 10 | ||
|
|
||
| - node: greasertriggergroup | ||
| entity: GreaseGunLowerAssembly | ||
| edges: | ||
| - to: greasertriggerwiring | ||
| steps: | ||
| - material: Cable | ||
| amount: 10 | ||
| doAfter: 10 | ||
|
|
||
| - node: greasertriggerwiring | ||
| entity: GreaseGunLowerAssembly | ||
| edges: | ||
| - to: greaserbarrel | ||
| steps: | ||
| - tag: Pipe | ||
| icon: | ||
| sprite: Structures/Piping/Atmospherics/pipe.rsi | ||
| state: pipeStraight | ||
| name: construction-graph-tag-pipe | ||
| doAfter: 10 | ||
|
|
||
| - node: greaserbarrel | ||
| entity: GreaseGunBarrel | ||
| edges: | ||
| - to: greaserbarrelwrenched | ||
| steps: | ||
| - tool: Anchoring | ||
| doAfter: 10 | ||
|
|
||
| - node: greaserbarrelwrenched | ||
| entity: GreaseGunBarrel | ||
| edges: | ||
| - to: greaser | ||
| steps: | ||
| - tag: Lubricant | ||
| amount: 1 | ||
| icon: | ||
| sprite: Objects/Consumable/Drinks/lube-tube.rsi | ||
| state: icon | ||
| name: construction-graph-tag-lubricant | ||
| doAfter: 5 | ||
|
|
||
| - node: greaser | ||
| entity: WeaponSubMachineGunGreaser | ||
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,7 @@ | ||
| - type: construction | ||
| id: greaserGun | ||
| graph: GreaserGraph | ||
| startNode: start | ||
| targetNode: greaser | ||
| category: construction-category-weapons | ||
| objectType: Item |
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 |
|---|---|---|
|
|
@@ -4,6 +4,9 @@ | |
| - type: Tag | ||
| id: AdvancedEnergyMagAmmo | ||
|
|
||
| - type: Tag | ||
| id: Lubricant | ||
|
|
||
| - type: Tag | ||
| id: Stunsword | ||
|
|
||
|
|
||
Binary file added
BIN
+416 Bytes
Resources/Textures/_Omu/Objects/Weapons/Guns/SMGs/greaser.rsi/base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+392 Bytes
Resources/Textures/_Omu/Objects/Weapons/Guns/SMGs/greaser.rsi/bolt-open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+176 Bytes
Resources/Textures/_Omu/Objects/Weapons/Guns/SMGs/greaser.rsi/construction-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+258 Bytes
Resources/Textures/_Omu/Objects/Weapons/Guns/SMGs/greaser.rsi/construction-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+319 Bytes
Resources/Textures/_Omu/Objects/Weapons/Guns/SMGs/greaser.rsi/construction-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+373 Bytes
Resources/Textures/_Omu/Objects/Weapons/Guns/SMGs/greaser.rsi/construction-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+450 Bytes
Resources/Textures/_Omu/Objects/Weapons/Guns/SMGs/greaser.rsi/construction-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+776 Bytes
...urces/Textures/_Omu/Objects/Weapons/Guns/SMGs/greaser.rsi/equipped-BACKPACK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+776 Bytes
...es/Textures/_Omu/Objects/Weapons/Guns/SMGs/greaser.rsi/equipped-SUITSTORAGE.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+447 Bytes
Resources/Textures/_Omu/Objects/Weapons/Guns/SMGs/greaser.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+317 Bytes
Resources/Textures/_Omu/Objects/Weapons/Guns/SMGs/greaser.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+305 Bytes
Resources/Textures/_Omu/Objects/Weapons/Guns/SMGs/greaser.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+163 Bytes
Resources/Textures/_Omu/Objects/Weapons/Guns/SMGs/greaser.rsi/mag-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 54 additions & 0 deletions
54
Resources/Textures/_Omu/Objects/Weapons/Guns/SMGs/greaser.rsi/meta.json
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,54 @@ | ||
| { | ||
| "version": 1, | ||
| "license": "CC-BY-SA-3.0", | ||
| "copyright": "Taken/modified from https://github.com/goonstation/goonstation/blob/0cc3070b5b6929aabf3750163b44bbaf940f46ae/icons/obj/items/guns/kinetic.dmi, sprite modification by NotoriousCapone, backpack sling created by NotoriousCapone, wield sprites by NotoriousCapone, base sprite heavily edited by NotoriousCapone for SS14", | ||
| "size": { | ||
| "x": 32, | ||
| "y": 32 | ||
| }, | ||
| "states": [ | ||
| { | ||
| "name": "icon" | ||
| }, | ||
| { | ||
| "name": "base" | ||
| }, | ||
| { | ||
| "name": "bolt-open" | ||
| }, | ||
| { | ||
| "name": "mag-0" | ||
| }, | ||
| { | ||
| "name": "inhand-left", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "inhand-right", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "equipped-BACKPACK", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "equipped-SUITSTORAGE", | ||
| "directions": 4 | ||
| }, | ||
| { | ||
| "name": "construction-1" | ||
| }, | ||
| { | ||
| "name": "construction-2" | ||
| }, | ||
| { | ||
| "name": "construction-3" | ||
| }, | ||
| { | ||
| "name": "construction-4" | ||
| }, | ||
| { | ||
| "name": "construction-5" | ||
| } | ||
| ] | ||
| } |
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.