Commit Graph
333 Commits
Author SHA1 Message Date
warriorstar-orionandGitHub a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
OctusandGitHub 631fbc7b20 Nerfs the WT-550's size. (#19791)
* i fucking despise IB

* compromise
2022-12-07 21:04:31 -05:00
4f95faf2c8 Adds sprites for opening and closing the bolt when using a bolt action rifle (Mosin). (#19510)
* Add sprites for mosin bolt opening and closing

* Bolt action code cleanup

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Fix missing bolt state

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2022-11-15 17:44:26 -06:00
Coolrune206andGitHub e80ae1f95f Removes .357 Speed Loaders from Autolathe, replaces with .357 Ammo Boxes (#19553)
* revolvers are balanced now, right?

* decreases metal cost per bullet from 5000 to 4000

* converts bullets to a new ammo box

* shut up Marmite (makes the revolver unrecyclable)
2022-11-03 18:01:05 +00:00
Stokes52andGitHub 39b5d3462d Adds new ERT laser carbine item and inhand sprites (#19512) 2022-11-02 21:10:45 +01:00
AzuleUtamaandGitHub c8edc8c240 Syndi Bundle Rework (#19352)
* Syndi Bundle Rework

* Revised bundles based on feedback

* Reworked operative into grenadier

* Corrected payday value
2022-10-26 00:19:56 +01:00
4c13246d30 Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5 (#19170)
* Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5

* grammer / typeblock

* 15 is not more than 15

* how did I miss this, I swear I put in 3

* path + crafting

* Update code/modules/crafting/guncrafting.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-10-14 08:28:07 +02:00
Vi3triceandGitHub 20c437f7d2 linters do your magic (#19263) 2022-10-10 20:58:41 +02:00
Bm0nandGitHub a78c1e9f12 Adds the Stechkin APS to the nukeop uplink (#18741)
* addAPS

* fixes HP ammo sprite

* hah i forgot the uplink refs

* surplus = 40
2022-08-10 14:21:51 +01:00
EdanandGitHub 1d552ab0e4 Armour Refactor (#18547)
* initial commit

* bullet fix + 100% armour pen

* equivalent armour values

* percentage armour pen

* updates bombing

* adds more defines

* i like armour too much

* review pass 1

* review pass 2

* updates with lavaland elites

* armour penetration value tweaks

* wt550 AP round change
2022-08-01 20:23:49 +01:00
moxianandGitHub e946c0b537 Switch guns and grenades over to /Initialize (#18332) 2022-07-24 11:44:42 +02:00
Bm0nandGitHub 0e61f8f2ee adds gun counter for wt550 (#18487) 2022-07-22 11:16:48 +01:00
Vi3triceandGitHub f4b37b4177 Port TG updating appearances (#17943)
* Get pants that match or else you gonna look silly yo

* Posters

* Fix other hud elements

* Rereviewed

* Update shotglass.dm

* Fix for new merged PRs

* Typo

* Coming across other stuff

* Update theblob.dm

* No takebacksies

* smh i forget to leave a comment

* Updated for the detgun and cards

* Should have rerun langserver again

* No longer plastic, more in scope

* Damn you bluespace

* Reverting turret logic, out of scope at this point

* Tweak that part

* Went over energy guns again, and fixed UI White's sprite sheet

* Welding masks, glasses, and JUSTICE

* Update portable_atmospherics.dm

* Cleaning up, clearing things up

* Review and suggestions

* Update valve.dm

* More tweaks

* Missing character

* Not distinct lightmasks, so they can be overlays

* Update generator.dm

* Add parameter so holodeck doesn't try to make a perfect copy

* Update unsorted.dm

* Spiders

* Better fix for spiders, fix vamps too

* Ghosts

* Update telekinesis.dm

* Cleaning up old procs

* It's set up to not copy datums... Unless they're in a list

* Donuts, duct tape, and detgun. D3VR coming to Early Access

* Update procs that interact with doors so they call update_state instead

* Forgot one spot, and actually might as well just force lock

* Cleaning up other things... Sigh, and kitty ears

* oops

* Getting used to how it works

* blinds

* Going back to the suit obscuring thing, so it doesn't update all the time

* Missed that from merging master

* I made this PR and forgot about it

* Fix runtimes in cards

* Make things a bit more unified

* Update update_icons.dm

* yarn, really?

* Update library_equipment.dm

* Update shieldgen.dm

* Every time Charlie merges something, I go back and see if I can improve things further

* what's this? more?

* Update misc_special.dm

* wow, paper

* Review

* More reviews

* To be sure, seems like being broken messed something sometimes

* Brought airlocks closer to how TG works to iron out some stuff

* Pizza and morgue

* Doesn't seem to hurt, tried with holodeck

* Revert "Doesn't seem to hurt, tried with holodeck"

This reverts commit 158529302b.

* Icon conflict

* Fix organ damage

* Don't ask how. Why. It's like that on prod too.

* Cutting down on things and updating from TG.

* More flexible. Just in case the thing you stuck it on didn't destroy.

* Hydro was one the things I touched earlier on, better rework it

* Reviews

* Cleaning up further, also bri'ish

* Undo a change I did, and switch over to a more recent implementation

* Update biogenerator.dm

* Rolling back to old airlocks, but with new duct taped note

* Functionally the same. I'd just rather not have the smoothing happen there

* Went over APCs again

* Fix welding helmet names in species files

* Update airlock.dm

* Update persistent_overlay.dm

* Oh, topic
2022-07-21 08:11:59 +02:00
VizandGitHub a7300d6199 splash one awful gun (#18357) 2022-07-14 23:20:53 +01:00
moxianandGitHub f0768024d2 /obj/item/storage no longer uses /New (#18306) 2022-07-12 21:38:06 +01:00
KalevTaitandGitHub 3bd7952ffb guns (#18237) 2022-07-08 09:18:54 +02:00
Bm0nandGitHub 1d0e3dde0f Updates a considerable amount of legacy weapon sprites to modern TG/Bay versions (#18118)
* test

* holdup

* more guns

* EVEN MORE CHANGES

* fuck

* eugh

* actual shit editor, love DM

* i think I just need inhands now

* final review, test pr

* ooops

* holy shit

* new maka

* foamforce new makarov

* this is going to be hell to review. is it?

* AHHHHH

* small melee fixes

* GOD DAMN STAFF

* as above

* i thought i fixed you, also grip added to wt550 inhand

* acutally deconflicts with the new camera pr, removes the new animated missle(rip)

* some fixes

* a bit more sprite cleaning

* i am suffering

* reverts 9mm

* seemingly forgot a few

* i think we're good now
2022-07-07 17:12:28 +01:00
705578b23b Energy detective revolver (#17771)
* Initial defines

* more work

* icon

* more stuff

* UID not hard ref

* tidying

* overload go brrt

* le sound and dead cell

* delet gap

* initial chargepack stuff

* simplify

* oops

* yeet this

* placeholder sprites

* oops magic number

* the gun speaks!

* consolidation

* tweaking and tidying

* so long old gun

* icon purge

* reapplies placeholder

* 1 minute tracker, not two

* makes it use a pinpointer

* revert tiny map changes

* cease your tracking, fool

* oops

* soft refs

* charlie review

* projectile ref to firing obj, removes testing overrides
& cleans up signals

* some more UID null checks

* ICONS

* ICONS CONFLICT

* MORE ICONS

* makes it freaking work

* first pass fixes

* charlie review

* charlie review 2, variable boogaloo

* fixes holsters

* colours the overcharged shot

* and recolours tracker to be yellow to match charge

* yellow laser icon

* widen overcharge misfire %

* fixes unlinkable pinpointers

* fixes gun not speaking when tcomms setup is changed

* steel request

* no chargey

* loudening 2022

* steel part 1

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* restores missing sprites

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-06-25 20:15:09 +01:00
a02187e08e Refactor ammo icon handling so that they show on map (#17807)
* Refactor ammo icon handling so that they show on map

.. and are not terrible to maintain.

* Small prettification

* .len -> length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Other .len -> length()

* And the rest of the .len -> length() in the touched files

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-05-27 20:35:05 +01:00
0f7a8707ef [Ready] Refactors stuns and status effects. (#17579)
* Fixes reviver runtime

* Confusion status effect

* Dizzy status effect

* Drowsiness status effect

* decaying -> transient

* Drunkenness status effect

* why use timer when SSfastprocessing work good

* stuns (mostly)

* weaken and immobalise

* stun/weaken times

* update_flags redundancies.

* Slowed()

* Silence + fixes transient decay

* Jittery

* sleeping

* Paralyze -> weaken

* Cult sluring

* paralyse

* Stammer

* slurring + projectile cleanups

* losebreath

* Hallucination

* forgor this

* eyeblurry

* eye blind

* Druggy

* affected didn't like my spacing

* review pass

* second review pass

* some cleanups

* documentation and signal framework

* confusion fix

* Fixes spec_stun

* rejuv fix

* removes a TODO

* conflicted myself

* fixes

* self review

* review

* removes TODOs

* adminfreeze

* TM fixes

* hallucination fix + others

* tones down alchol and runtime fixes

* confusion overlay suggestion

* more fixes

* runtime fix

* losebreath fix

* clamp => directional bounded sum

* steel review

* oops

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* reduces the dizziness cycle rate

* borg hotfix

* sanctified decursening

Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-05-24 16:35:26 +01:00
Mitchs98andGitHub 21209687f4 removes finger gun force (#17456) 2022-03-08 11:22:17 +00:00
SabreMLandGitHub 1c3c2c22ad Name Capitalisation Tweaks (Weapons) (#16906)
* Weapon names

* Assault rile

* More #coding_chat tweaks

Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.

* Missed these
2021-11-04 19:47:31 +01:00
variableundefinedandGitHub 5339cdf212 Merge pull request #16659 from Fox-McCloud/the-end-of-lethal-shot
Nerfs Shotguns
2021-09-19 11:25:02 -05:00
hal9000PRandGitHub 3c52cea099 fix (#16728) 2021-09-18 15:36:35 +01:00
variableundefinedandGitHub 6c085cf23b Merge pull request #16064 from michaelyesok/foampistol
Foam enforcer tweaks
2021-09-11 19:12:07 -05:00
Fox McCloud a081051133 Nerfs Shotguns 2021-09-08 12:17:08 -04:00
variableundefinedandGitHub 936fbf3194 Merge pull request #16601 from Qwertytoforty/wii-sports-annoucer
Adds antimatter sniper rounds, buffs bleeding rounds, nerfs base sniper rounds
2021-09-01 19:46:04 -05:00
michaelyesokandGitHub 9a7aadd3a0 Merge branch 'master' into foampistol 2021-08-30 00:18:12 +02:00
variableundefinedandGitHub e4355d7d63 Merge pull request #16529 from chafla/foam-fixes
Ensure only pistol-type weapons can be holstered
2021-08-29 14:47:09 -05:00
Qwertytoforty e9e7522076 Adds antimatter sniper rounds, changes variables around 2021-08-26 17:05:21 -04:00
variableundefinedandGitHub c6c84c478d Merge pull request #15652 from E-MonaRhg/gamma_armory_buff_v2
Buffs to gamma armory v2
2021-08-14 11:30:15 -04:00
578eda4fae Update code/modules/projectiles/guns/projectile/toy.dm
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2021-08-13 10:54:36 -07:00
chafla 0f0a18c6c7 Set holster default to false 2021-08-12 14:42:36 -07:00
chafla 3876f5b8fc Ensure revolvers are holsterable, with exceptions
Makes base revolver datum holsterable
Excludes grenade launchers, advanced mimery
2021-08-12 13:47:14 -07:00
chafla 138f71b286 Fix typo in enforcer desc while we're at it 2021-08-11 18:19:57 -07:00
chafla d93089cf52 Make foam pistols able to be holstered 2021-08-11 18:18:30 -07:00
SabreMLandGitHub 2c0ae9c500 Refactors the 'Examine' status tab (#16330)
* Removes the 'Examine' tab

* Revert "Removes the 'Examine' tab"

This reverts commit 0dd01722c9.

* Initial system and misc items

* Atmospherics

* Engineering

* Medical

* Mobs

* Stacks

* Structures

* Turfs & Weapons

* Final stuff and bad documentation

* Sheer laziness
2021-07-26 18:11:57 +01:00
E-MonaRhg 526187fc7b Merge remote-tracking branch 'upstream/master' into gamma_armory_buff_v2 2021-07-08 23:43:41 +02:00
SabreMLandGitHub 0b375de42c Removes the the vast majority of 'The the' from the the code (#15597)
* The the

* Some more

* Review 1

* A couple more
2021-06-20 10:20:32 -04:00
QwertytofortyandGitHub 810a94e48b Prevents every gun under the sun from lying about alt skins (#16205) 2021-06-18 21:14:33 +01:00
PidgeyandGitHub f28e20af21 Anyone can now use the finger gun and fake finger gun spells. (#15941) 2021-06-17 10:40:35 +01:00
042d63c897 mochi suggestion
Co-authored-by: dearmochi <shenesis@gmail.com>
2021-05-23 17:44:06 +02:00
michaelyesok 9c6fed0f3b blue gun yes 2021-05-23 17:27:58 +02:00
S34NandGitHub ae6f6148c2 Solgov tweaks (#15896)
* marines, solgov, and more!

* belts are belts

* forgot da hat

* swapped guns around, loadout hat no longer strong

* Update code/datums/outfits/outfit_admin.dm

* updated shading on uniforms

* yeets a null entry

* gas masks, flipped caps

* renamed gas masks

* merge conflicts

* dmi conflicts confuse me

* ARG mag update
2021-05-16 11:38:16 +01:00
S34NW 86b7f81701 bye-bye sticks, come with me if you want to live 2021-04-13 20:56:18 +01:00
Sean WilliamsandGitHub c0d07bb627 shotguns now go off in your face upon sawing (#15772) 2021-03-30 16:15:47 +01:00
AffectedArc07 f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
E-MonaRhg 63a904c190 Buffs to gamma armory v2 2021-03-02 15:47:39 +01:00
Fox McCloudandGitHub 20485c029b Pickup and Dropped Bugfixing (#15575) 2021-02-24 19:23:31 +00:00
Fox McCloudandGitHub efa3aecb61 Ports TG Pickup, Equip, and Drop Sounds (#15572)
* Ports TG Pickup, Equip, and Drop Sounds

* really
2021-02-24 12:51:59 +00:00