Commit Graph

185 Commits

Author SHA1 Message Date
Firecage
730fd6729b Adds several new back slot icons for guns, while also updating two existing ones. (#47898)
* Adds back sprites for the Particle Acceleration Rifle, and updates the back sprites for the combat and riot shotguns.

* Adds adds a back slot icon for compact combat shotguns.

* Adds a back slot icon for the surplus rifle.

* Adds back slot icon for the Mosin Nagant and allows it to be worn on the back.
2019-11-23 00:00:02 +01:00
Emmett Gaines
5481515dff Removes the non bitflag slot defines (#47742)
Removes the non bitflag slot defines
2019-11-17 17:52:11 -08:00
carlarctg
86f1e5b0a1 fuck jannies (#47472) 2019-11-03 23:07:12 +01:00
Shaps
06ce4cd5f9 bang bang she shot me (#47443) 2019-10-30 16:27:15 -07:00
spessbandit
e3d1e5c53e ghosts can't use monitors; dextrous animals can climb crates; fixes atrocious spelling (#47262) 2019-10-22 04:37:35 -07:00
81Denton
f5bd6a381d Merge pull request #47052 from kingofkosmos/misc_span_fixes1
Misc span fixes
2019-10-20 18:46:54 +02:00
spookydonut
cca969feea change these away from defines (#47105) 2019-10-17 10:10:51 -04:00
kingofkosmos
52325eda25 Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1
# Conflicts:
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/structures/beds_chairs/chair.dm
#	code/game/objects/structures/lavaland/geyser.dm
#	code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
#	code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
#	code/modules/paperwork/contract.dm
2019-10-17 06:02:06 +03:00
Fikou
7ca0ae8ce7 shotguns are now a heavy weapon (#47039)
* awoo

* awoo

* n

* e
2019-10-15 16:49:33 +02:00
AarontheIdiot
9c583c8faf long gun takes 2 hands 2 hold (#47081) 2019-10-15 10:20:47 -04:00
kingofkosmos
228b4282ca Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1
# Conflicts:
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/modules/mob/dead/new_player/new_player.dm
2019-10-13 15:21:17 +03:00
carlarctg
0d8160938f sawn off shottie has an inhand (#47019)
Changelog

cl
fix: sawn off shotgun has inhand
/cl
2019-10-13 16:45:06 +13:00
kingofkosmos
280d416d4f Adds missing spans, missing periods and missing span endings. Also changes spans to suit the situation better. 2019-10-12 19:34:11 +03:00
William Wallace
45f2feda3b replace extra icon_state with item_state in /obj/item/gun/ballistic/rifle 2019-10-09 00:15:41 +01:00
Qustinnus
a394ccdc2b Material datum chairs & tables and applies materials to all items (Now with less pain for mining & RnD) (#46525)
removes materials list from items, uses custom_materials instead. This might introduce some bugs so we should testmerge this for a while (and Ill test stuff locally as much as I can)

this also adds material crafting to sheets. Test case being chairs. In the future we can add stuff like tables, walls, doors etc.

also applies materials to everything, with fixes, which can close #46299
2019-10-08 11:06:02 -04:00
81Denton
8cfe0b3ccf Soul stone tweaks (#46765)
* Soul stone tweaks

* h

* fuck
2019-09-30 14:27:55 -04:00
spookydonut
210ba5c571 Adds linting for equipped() pickup() dropped() (#46614)
* lint some inventory procs

* lineends

* f

*  line end

* lineend

* fuck

* changes per review
2019-09-25 02:31:29 -07:00
Rob Bailey
7d7a1e72d9 Gun sound revamp (#46689)
* shitload of new sounds

* dme fix

* file fixes

* more file fixes

* more file fixes

* volume tweaks + better pistol sounds

* more new sounds + no through walls suppressed

* better suppressed

* more work

* pistol handling sounds

* small tweaks
2019-09-24 18:01:27 -04:00
kingofkosmos
8358169b8e New 'hear' span class (#46369)
* Reverts italics-span back to no color.

* Cleans up many extra spaces and indents.

* Adds 'hear' span class.

* Replaces all 'italics' used in heard messages with 'hear'.
2019-09-14 23:56:34 -07:00
Rob Bailey
2029163d33 playsound vary boolean define conversion (#46254)
About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
2019-08-30 18:45:20 +12:00
kingofkosmos
df1fecc58c Adds notice-span to visible_messages with no spans (#46044)
About The Pull Request

Adds 'notice' span class to all visible_messages which had no span class, making all those black messages blue.
Why It's Good For The Game

This should help differentiate action-messages from talking-messages in the chat. More actions will be blue, thus black talking-messages should pop out more.
2019-08-26 20:50:00 +12:00
carlarctg
8f34bf11aa Adds inhand improvised shotgun sprites (#45995)
* the poke

* e

* wrong bracnch

* improvised spripes

* better spropes

* hoook time

* hooky

* h

* fuckkkk

* "fix"

* fuggggggggggggggg

* shit wrong pr

* fixes

* no e

* un-hooked

* more unhookinga

* added unused twohanded sprites

* Revert "Merge branch 'master' into shotgun"

This reverts commit 95caaf6270cebdc21b80659a6a0725bf37c005d1, reversing
changes made to 3cec8e8f3b188a15a495adb61f724cedd7d35246.

* Revert "Revert "Merge branch 'master' into shotgun""

This reverts commit 6677b4718f22f99befe4e9718b9b7c1f02ea6311.

* Revert "Revert "Revert "Merge branch 'master' into shotgun"""

This reverts commit 3df1e045861bb3abcebaa5b900648b016c53d620.

* Revert "Revert "Revert "Revert "Merge branch 'master' into shotgun""""

This reverts commit 8fc15d61daf40dd2ae557fdefdbd73274540cf01.

* big brain move ahead

* big brain move actuated
2019-08-22 00:23:55 -07:00
nemvar
a5e62c93b0 Fixes bulldog inhands (#45833)
* The bulldog has inhands once more.

* forgot these are a thing
2019-08-11 22:16:29 -07:00
Rob Bailey
8c36cf28a4 Better shotgun inhands (#45521)
About The Pull Request

Someone correctly pointed out to me that the other ones would need a free hand, and two hand component still isn't done yet. Whoever is working on it, get going for zero pay, and do it faster.

Since people did not like how THICC and BEEFY the inhands were as well, I made them a little shorter to make them look less like they're 7 ft long.

image
64xshottygun

This is what they're going to look like now, I'll bring back those two hand ones once the component is done eyes

for combat shotgun, regular shotgun, riot shotgun, and double barrel.
Changelog

cl
imageadd: New shotgun inhands
/cl
2019-08-01 21:19:12 +12:00
Arkatos1
23128c948e Fixes trigger restrictions for magic barrages spells (#45403) 2019-07-24 16:12:03 -07:00
tralezab
3b49b5378d Yet Another Fugitives PR: Bounty Hunters, Features, Fixes, Treason, Removals! (#44802)
* mostly fixes in this commit

* removes old_god from the dme

* russian shuttle improvements

* TODO: fix the hook gun

* shotgun finished, next commit shuttle

* bounty hunting shuttle

* back up to speed on the dmis

* readds poster 46 and adds the shuttle finally

* dmi fixes

* traps need fixing, work out whatever is happening with synths

* super final touches, see desc

map ports + proper spawners, pinpointer and traps functional. other misc changes

* removes verb stuff from non verb stuff

* review (see desc)

antimagic checks and it now the two objects move inside each other instead

* dmi conflicts

* PLUNGERS. BEGONE.
2019-07-22 20:00:34 +02:00
ShizCalev
d44535c1f7 Fixes revolvers being spun when they fail to spin (#45092) 2019-07-11 11:42:20 -04:00
nemvar
b337b403d0 Improve sawing off guns, let chainsaws do it too (#44908)
The way guns are sawn off is now more sane. You can now use chainsaws
to saw off guns.

Chainsaws are pretty meaty. They are also made out of the exact item
that is usually used to cut guns. I mostly added this because it felt
weird refactoring this without adding a feature so I can get more
updoots.
2019-07-04 20:45:31 -07:00
kingofkosmos
6e0acf4471 Fix spinning the Russian Revolver (#44904) 2019-07-02 16:49:44 -07:00
kingofkosmos
c969f6d3eb Merge branch 'master' into addswarningspans 2019-06-27 15:12:54 +03:00
Shaps
4f6ee6b7e8 Makes Mosins bulky, lets you saw them into Obrezes [2] (#44791)
About The Pull Request

I was dumb and made the last PR from my master branch instead of a branch branch, see #44774 for past discussion

Makes the Mosin Nagant rifle bulky instead of normal sized, but allows you to saw them off much like your average shotgun to normal size. However, sawing it down will introduce bullet spread because of the drastically reduced barrel.

Why It's Good For The Game

The Mosin Nagant is a really fucking big gun, 48.5 inches in its full length model, and with a bayonet attached it can reach near 6 feet long in total. Item size isn't 1:1 with real life, but considering just how notorious they are for being really big, paying homage to it feels right. Plus, running around with sawed off guns feel much more illegal and thus fun.
Changelog

cl Shaps/Ryll
tweak: Mosin Nagants are now bulky, but can be sawed off to fit in a bag
/cl
2019-06-27 20:28:32 +12:00
kingofkosmos
d7dd679b5a Fix span endings (#44812)
Adds a slash to instances of <span>" --> </span>".
2019-06-26 15:11:03 -07:00
kingofkosmos
fb9731492c * extra spaces removed from "span class = '" --> "span class='"
* warning-spans added to cases of "You need..."
2019-06-25 21:03:25 +03:00
nemvar
c1fb454367 arcane (#44716) 2019-06-25 15:30:50 +02:00
vuonojenmustaturska
8ddc9677c7 examine-code refactor (#44636)
* 1/4 done? maybe?

* more

* stuff

* incremental stuff

* stuff

* stuff & things

* mostly done but not yet

* stuffing

* stuffing 2: electric boogaloo

* Git Commit and the Kingdom of the Crystal Skull

* make it actually compile

* found more stuff

* fixes

* fix AI laws appearing out of order

* fix windows

* should be the remaining stuff

* this time for real

* i guess it should compile too

* fix sechuds
2019-06-19 22:07:57 +02:00
vuonojenmustaturska
fb45b7a017 Turns trait accessors into defines, fixes some bugs (#43820)
It's free performance.
2019-05-06 19:44:05 -04:00
ShizCalev
a0652c3700 Enable tac reloads for most ballistic weapons (#43466) 2019-04-04 23:51:58 -07:00
WJohn
b8c032f7c0 New 357 Revolver Sprites (#43438) 2019-04-02 01:34:59 -04:00
pireamaineach
617880080c [NOT FUCKED ANYMORE] Numerous detective related changes. (#43317)
Numerous detective related changes.
2019-03-29 13:23:38 -04:00
Rob Bailey
43f4b89ab5 [READY] Open bolt weapons eating bullets fix (#42948)
About The Pull Request

Fixes #42926
Why It's Good For The Game

Fixes broken shit

No CL, this was pretty hard to notice unless you were intentionally pulling the mag out and putting it in for some reason.
2019-03-17 23:21:07 +13:00
Rob Bailey
86cb5c2576 Fixes the RPG, renames it and adds some fluff text (#42853)
* fixes rocket launcher, but not some other issues with it

* oh god oh fuck I broke everything

* ok nevermind we rollin

* remove a dumb testing runtime

* less weird gramma on new description

* change the typepath of the rocket to make it easier to know what it is

* I don't remember if I even changed anything here but here it is anyways

* grammar error fix

* better qdel

* casing to fix the article system

* grammar fixes + hack to clear the mag

* small hack for single round mags and makes sure icons update after being loaded

* whoops

* minimize diffs

* capitalization with improper flag
2019-02-25 21:48:11 +11:00
Jordie
f19e6ee4d4 Merge pull request #42888 from actioninja/foampistolfix
Fixes some sprite issues with the foamforce pistol
2019-02-25 21:39:21 +11:00
Rob Bailey
a0787fef05 Fixes the Russian Revolver dual wield exploit (#42887)
Fixes #42880
Also theoretically patches out any future bypassing behavior by overriding the function that makes guns actually able to shoot since the russian revolver is all special functionality.
Also corrects some odd behavior with the russian revolver.
## Why It's Good For The Game

I don't think a free 357 is a good idea
## Changelog

cl
fix: The anti-combat mechanism in the Russian Revolver has been revised to prevent usage while dual wielding.
/cl
2019-02-25 09:30:12 +13:00
actioninja
dd6beabe4b fix pistol sprites 2019-02-24 03:49:27 -08:00
Rob Bailey
a39b5d352f Yet more gun fixes (#42722)
Continues fixing the tide of broken shit with my awful PR.

This time around:
Corrects a control message for the l6 saw on examine
Reworks the way that open bolt guns work so that they actually work the way open bolt guns are supposed to. Loud bolt drop when you try to fire an empty magazine included.
Fixes bulldog magazine overlays.
Fixes an issue with tacloads not updating the removed magazine's icon state correctly.
Fixes locking bolt not locking back on the last bullet fired but instead on the
2019-02-10 08:02:33 +13:00
Rob Bailey
8d817adb5e More General Gun Fixes (#42693)
Fixes some incorrect sprite paths, bad implementation, and logic inconsistencies that were resulting in missing sprites and fucked up sprites. Fixed some weirdness with the RPG due to wrong bolt type. Fixed bullet count being incorrect on anything with an internal magazine. Fixed issue with internal magazine tacloads that was resulting in them locking up and being unable to shoot.

Closes #42683
Closes #42672
2019-02-09 16:34:36 +13:00
Rob Bailey
ecf9e538ed Gun (Hot)Fixes (#42666)
Fixes my broken bullshit.
2019-02-05 09:32:52 +13:00
Rob Bailey
69e217d8d9 [READY] I got guns (#41804)
cl actioninja\memager
refactor: Ballistic guns have been almost entirely reworked from a backend side. This primarily focused on moving as much as possible into the base ballistic gun and turning as many other guns into essentially varedits as possible.
add: Guns can now be racked. This is the default action unless the magazine is empty.
add: Guns now can have the magazine removed by clicking on them with an open hand while they are in hand.
tweak: Suppressors are now removed by alt clicking instead of clicking with an open hand
add: Guns now have various bolt types that all function a bit differently. Open bolts cannot have a bullet chambered with no mag, locking bolts lock back after running out of ammo, etc.
add: All ballistic gun sounds are controlled by variables instead of hardcoded usages.
tweak: The l6 LMG has a reworked control scheme. alt + click to open and close the cover, open hand to remove mag, place mag in by slapping them together, default action is rack.
tweak: Functionality that used to be snowflake code such as tactical reloads has been moved to the base gun, and can be toggled by variables.
refactor: All shotguns are now properly subpaths of the shotgun type. They still work the same.
imagedel: Gun sprites have been almost entirely overhauled to use overlays instead of states. This collapsed the L6 sprite from 20 sprites to 9 sprites to give an example.
soundadd: Remixed versions of the shotgun and base gun firesound
soundadd: New rifle firesound for l6 and moist nugget, new SMG fire sound, new sniper fire sound.
soundadd: Lots of new weapon operation sounds such as racking and bolts and the like.
imageadd: New sprites for the Riot Shotgun, Combat Shotgun, c20r, Deagle, m90, double barrel shotgun and 1911 by Memager.
imageadd: All gun sprites that were pointing to the left have been flipped to point to the right.
balance: Shotguns now can be pumped faster.
balance: Bulldog can now be tac reloaded
balance: Sawn off shotguns now have an accuracy penalty and recoil
/cl
2019-02-04 10:27:01 +13:00
81Denton
cd3d97c1a6 Reworks spearguns, adds Syndicate bundle, carp clothing adds carp faction (#42102)
* Reworks magspears, adds Syndicate bundle, carp clothing adds carp faction

* 20 magspears

* Replaces bandolier with quiver

* Slightly increases throwforce to OHKO space carps
2019-01-07 19:19:45 +13:00
Rob
6b8bfb2f5c [EXTRAREADY][AAAAAA] Hey revolver, don't mothers make good fathers? (#41620)
tweak: Suppressed and dry fire sounds are now stored as a variable, and can be edited on a per gun basis.
sounddel: The standard gun dry fire sound was collapsed to one sound instead of 4. They were all just pitch variations anyways, which is now covered by built in sound pitch variation.
soundadd: Revolvers now have a unique gunshot sound that is slightly different for 357 and 38.
soundadd: Revolvers now have a unique dry fire sound.
soundadd: Revolvers now make a unique noise when emptying them besides just the sound of shells falling out.
soundadd: Spinning a revolver such as the Russian Revolver now makes a sound.
spellcheck: Syndicate sniper kit now includes a suppressor instead of a "supressor."
2018-12-02 20:30:09 +13:00