Skip to content
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

Guns and Some Stuff Added #83

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

Leonister
Copy link
Contributor

  • Bumper Sword (re-edited)
  • Machete Gladius
  • Maria 9mm
  • Lucky 357.
  • Handmade Rifle
  • Cowboy Repeater
  • Battle Rifle

- Icon from Bumper Sword re-edited
- Added Machete Gladius
- Lucky 357.
- Maria 9mm
- Cowboy Repeater
- Battle Rifle
- Handmade Rifle
@ma44
Copy link
Contributor

ma44 commented Oct 16, 2018

@Leonister Conflicting files; cannot merge
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
icons/obj/guns/projectile.dmi
icons/obj/weapons.dmi

Ping me when you somehow got the memes done

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants