Commit Graph

867 Commits

Author SHA1 Message Date
Qwertytoforty
04bca1fe79 The sound of shells dropping from a gun is no longer louder than the gunitself. Reloading modified (#22800)
* please have mercy

* actually you probably hear bigger guns reload maybe.

* extra true, removes mag sound if silenced

* Update code/modules/projectiles/guns/projectile_gun.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-12 17:29:13 +01:00
PopGamer46
348c14f736 Makes gun reskins use a radial menu instead of a input menu (#22682)
* input to radial

* hands blocked trait instead of incapacitated

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* remove null parameter

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* rename reskin radial proc

* fix

* shorten code

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-09 20:38:41 +01:00
Qwertytoforty
c407395e3a where's that chime (#22503) 2023-10-09 20:29:06 +01:00
Contrabang
f3f9bd442a Changes slot number defines from lowercase to all uppercase (#22297)
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
2023-10-03 18:27:51 +01:00
Qwertytoforty
73df3fcf14 Antimatter now innacurate without zooming. Sniper projectiles are faster / pass through weak stuff. (#22506)
* I should port the sniper rifle bot from blood blockade battlefront

* fuck that a

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* variable on bullet

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-10-03 17:10:55 +01:00
DGamerL
4c976a6e01 Splits up item_inhands.dmi (#22584)
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Fixes jackhammer and glass shard

* Fixes toy Chainsaw

* Update code/game/objects/items/toys.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/weaponry.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Fixes edagger hopefully

* Henri review

* Oops

* First this gone, and now the pain

* Should all be fixed now

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-10-01 11:47:25 +01:00
Adrer
d1d27ae5fa Fix energy gun descriptions (#22647)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-09-30 12:56:47 +01:00
DGamerL
ed11dad321 Buffs Nuclear Operative Cyborgs (#22444)
* Pinpointer + grenade launcher

* NANOPASTE FOR THE PEASANTS

* Adds pinpointers lmao

* Removes the Nuke

* Henri review

* Update code/game/gamemodes/nuclear/pinpointer.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Henri review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-25 19:05:15 -04:00
Qwertytoforty
c0e29df99f Kinetic schemetic (#22440) 2023-09-19 19:44:02 +01:00
Henri215
9fdf2992be Ports Rod of Asclepius in hand sprites and moves staves in hands into a new file (#22250)
* Ports Rod of Asclepius inhand sprites and moves
staves hand.dmi into a new file

* removing for now

* its conflict time

* lets fix this conflict

* ah shit

* here we go again
2023-09-19 18:58:11 +01:00
Contrabang
30dacc03e3 Adds crutches (#21959)
* crutches!

* comment update

* henri review

* comment tweak

* in-hands updated

* i can spell

* two handed component

* unfuck this file

* oh lord map changes

* make the placing a little more reasonable...

* changes to cyberiad
2023-09-11 12:50:05 -05:00
matttheficus
ae78b936e5 Removes All CamelCase'd "NanoTrasen" (#22156)
* begone CamelCase

* someone did an oopsie and it wasnt me

* CI addition (thanks contra)

* contra review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* CI moment

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-07 11:18:29 +01:00
DGamerL
db1ed68a7d Tweaks some nuclear agent items (#22119)
* First changes

* Dont forget to do cooldown shit

* I HATE PEOPLE AAAAA

* Defib almost done

* Okay we ball

* Defib done

* I hate bullets

* Sniper done

* More stamina damage

* GDN review + Oops I forgor this

* Update code/datums/components/defibrillator.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Disintegrate go brrrr

* Lewc review

* Ghhhhh

* Final oopsie fixed

* Almost made an oopsie daisy myself

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-07 10:52:48 +01:00
matttheficus
0c8a6a29d7 Removes Stun Arm from Safety Override, Adds Proto Emitter (#22076)
* begone secborg 2.0

* god i hate autocomplete

* slight buff

* sean review
2023-09-01 23:13:30 +01:00
GDN
5a19e6c29a fixes some issues with the wormhole projector (#22051)
* fixes some issues with the wormhole projector

* Update code/modules/projectiles/ammunition/energy_lens.dm

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-08-25 16:40:14 +01:00
1080pCat
ce9b22952e silly (#22078) 2023-08-23 22:15:54 -05:00
HMBGERDO
979935a7c9 Fixed Trick Revolver, Added Trick minibomb (#21915)
* trick revolver fix, trick minibomb added

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/grenades/syndieminibomb.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/projectiles/guns/projectile/revolver.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/projectiles/guns/projectile/revolver.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/objects/items/weapons/grenades/syndieminibomb.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/modules/projectiles/guns/projectile/revolver.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-08-21 19:56:33 +01:00
DGamerL
b0b347660e The Rapid Syringe gun now costs 12 TC. It can also pierce all clothing now. (#21674)
* RATATATATATA

* We use TRUE, not 1

* making it cost 12

* making progress

* FINALLY

* Lewcc review

* Whoops this too

* Lewcc review

* Might work, might not, but conflict time

* Henri review
2023-08-16 19:52:02 +01:00
Silverplate
ff909adfb1 Adds Species Unique Traitor Gear (ready for review edition) (#21313)
* Vars and ideas

* Adds supercharge implant

* species specific tot gear!

* Adds vox spikethrower

* Adds Love injecting pen (skrell)

* sprite issue fix

* typographical error.

* makes pen not refillable, pacifies

* Adds fireproofing nanite injector (plasmaman)

* Lower KD on spikethrower per qwerty

* Lewcc review

* aaaa so much space indentation

* steelslayer review

* Steelslayer review

* Lewcc reviews

* Changes the spans

* Lewc review, Thanks to DG for doing my PR for me.

* Update code/modules/projectiles/guns/energy/special_eguns.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Henri review

* Forgot this one

* Whoopsie number 2

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-16 19:25:25 +01:00
Evаn Summers
cf2a4380f6 Fix: stop magic staff recharging while already at max charge (#21692)
* Fix for staffs recharging while at max charge

* Update code/modules/projectiles/guns/magic.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/projectiles/guns/magic.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/projectiles/guns/magic.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/projectiles/guns/magic.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-08-12 18:51:22 +01:00
matttheficus
bdd8e8a20d Disabler Nerf: Slowdown Tweaks + Shot Reduction (#21499)
* Update _species.dm

* reduce shots

* dont nerf the u-ion

* sirryan review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-08-02 11:43:42 +01:00
Bjamcham
0c4a99d73d It now works (#21724) 2023-07-24 15:42:03 +01:00
Fridge Burns
bf02bb1cf3 Update the in-hand sprite when a gun is reloaded (#21676)
* update user hand on reload

* review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* use forceMove

---------

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2023-07-24 15:30:06 +01:00
Octus
912d444d07 Removes Vox... Armalis, yes the other vox we forgot about (#21519)
* youtube 2008 die sound effect

* I take pride in my work

* noisecannonsbegone

* armalis clothing shit
2023-07-23 20:14:27 +01:00
DGamerL
fa455fe213 Changes the revolver obtained from gatfruit to an overgrown revolver (#21320)
* gatfruit more like gattofruit

* increases max ammo to 8

* bio is not a valid research

* small issue

* adds a missing space

* gatfruit takes time to open now

* Sirryan's request

* adds the sprite

* lewcc review + sprites

* ghhhhhh

* sprites are working
2023-07-15 14:42:10 -05:00
HMBGERDO
d403c7273f Projectile accuracy tweak (#21225)
* If we hit target we didnt aim at, there is no accuracy

* 1 tile 100% accuracy

* sniper projectiles always accurate
2023-07-05 19:46:49 +01:00
BiancaWilkson
e6f8b543ae Refactors rocket launchers, adds it to nukie uplink (#21273)
* initial changes to rocket launcher

* moves the missiles to special projectiles

* gonna keep it real, im too high for mechcode

* missiles are now projectiles

* pt. 2 of last commit

* Now we don't need process fire to handle all this

* shoots you with my gun that makes you explode

* uplink time

* I hate mechs I hate mechs I hate mechs

* minor typo detected

* tech origin fix

* whoops the light ones explode twice

* THIS JUST MAKES IT WORK????

* maybe balance is a good thing

* Renamed ammo in uplink

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* sirryans reviews, ill learn to document someday

* Forcemove time

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-06-21 22:39:29 +01:00
HMBGERDO
b74cd79c03 Allows us to drop NODROP items if there is other way to get rid of them (#21080)
* adds proc to check if we can drop nodrop items

* C:/Program Files/Git/obj/effect/proc_holder/spell/touch refactor, support for wizard spells, xeno spells and changeling shield

* bug fixes, cleanup

* moved to signals, added support for mime fingergun

* fixed bugs

* cleanup

* same proc for removing weapon from active or any hand

* changeling fast swap exist again

* cleanup

* fix runtime

* signals cleanup

* review update

* Update code/datums/spells/mime.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/datums/spells/mime.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/datums/spells/touch_attacks.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* review updates

* fixing bug

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-06-15 19:18:17 +01:00
Contrabang
3c3264dc08 medbeam fix (#21242) 2023-06-05 15:36:34 +01:00
Contrabang
3f87165a03 CI now bans files with the same name (PART 2) (#21051)
* CI change

* world.dm

* .dme world.dm

* subsystem renaming

* .dme for subsystems

* ai_laws.dm

* armor.dm

* emote.dm

* logging.dm

* spell.dm

* air_alarm.dm

* crew.dm

* decal.dm

* emissive_blocker.dm

* footstep.dm

* spawner.dm

* fire.dm

* carbon.dm

* living.dm

* mob.dm

* movement.dm

* thermal_drill.dm

* plasmamen.dm

* lavaland.dm

* chaplain.dm

* lightning.dm

* magnet.dm

* mimic.dm

* wizard.dm

* morph.dm

* vampire.dm

* click.dm

* self.dm

* radiation_storm.dm

* airlock.dm

* autolathe.dm

* mulebot.dm

* nuclearbomb.dm

* particle_accelerator.dm

* smartfridge.dm

* syndicatebomb.dm

* vending.dm

* wires.dm

* sound.dm

* mining.dm

* syndicate_space_base.dm

* monkey.dm

* guardian.dm

* bomb.dm

* standard.dm

* nuclear.dm

* pinpointer.dm

* access.dm

* departments.dm

* job.dm

* science.dm

* buttons.dm

* cloning.dm

* igniter.dm

* wishgranter.dm

* atmos_control.dm

* message.dm

* power_monitor.dm

* mecha.dm

* combat.dm

* mining_tools.dm

* meteors.dm

* spiders.dm

* contraband.dm

* aliens.dm

* uplinks.dm

* voice.dm

* intercom.dm

* lights.dm

* robot_items.dm

* mineral.dm

* dice.dm

* extinguisher.dm

* paint.dm

* signs.dm

* staff.dm

* smokebomb.dm

* boxes.dm

* random.dm

* janicart.dm

* statue.dm

* cargo.dm

* asteroid.dm

* headslug.dm

* fulton.dm

* atmospherics.dm

* pump.dm

* corpse.dm

* oldstation.dm

* gps.dm

* preferences.dm

* clothing.dm

* ears.dm

* glasses.dm

* boxing.dm

* color.dm

* renames ninja gear files

* recipes.dm

* error_handler.dm

* anomaly.dm

* floorcluwne.dm

* undead.dm

* overmind.dm

* shield.dm

* bottle.dm

* organ.dm

* piano.dm

* plasma_fist.dm

* language.dm

* mob_defines.dm

* mob_helpers.dm

* damage_procs.dm

* _defines.dm

* empress.dm and queen.dm

* brain.dm

* organ file renaming

* subsystems.dm

* constructs.dm

* bot.dm

* pet.dm

* nature.dm

* magic.dm

* colors.dm

* drugs.dm

* medicine.dm

* toxins.dm

* shuttle.dm

* surgery.dm

* moves a bunch of define files

* traits.dm

* names.dm

* other_mobs.dm

* flags.dm

* some final define files

* well turns out contractor_pinpointer.dm was  taken

* I forgot to remove this file

* how in the hell did this get unticked

* I DID INCLUDE IT, but there was a "w" there

* swaps the world definitions

* camera renamed to SScamera

* examine -> alien_examine
2023-06-02 14:30:17 -05:00
Qwertytoforty
0b25b15536 Makes lwap scope not freak out if move before scoping (#21007)
* makes scope not freak out if move before scoping

* jesus christ qwerty nice fucking infinite loop
2023-05-22 22:05:02 +02:00
Qwertytoforty
27aba816b8 Fixes BSG and lwap mob /icon sprite issues (#21064)
* Fixes BSG and lwap mob /icon sprite issues

* ratios ratio
2023-05-13 23:45:32 +02:00
DGamerL
0241d3060d Rebalancing the BSG (#20953)
* Rebalancing

* Weight class is now bulky

* Adds a small comment on the cd
2023-05-02 21:59:28 +02:00
Qwertytoforty
d5567103fd Reworks the lwap to make it better. (#20884)
* Boss you killed a child... AMAZING MISSION COMPL-

* small patch fix other stuff later

* More fixes to clicking on the dot

* lwap scopes better / decativates on movement

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* requested changes

* lower speed by marms suggestion

* scope keeps creeping

* Apply suggestions from code review

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

* henks changes

* define

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-05-02 21:28:34 +02:00
Henri215
33576936dc Adds the AK-814 rifle (#20820)
* Adds the AK-814 rifle

* lets kill another conflict

* Die conflict!
2023-04-22 09:30:14 +02:00
MisterMovie
727e3e7b53 (serious) Fixes (?) the sprite of the honk rifle (#20801)
* Adds an old sprite for the honkrifle

* Revert "Adds an old sprite for the honkrifle"

This reverts commit 26f04dd735.

* adds an old sprite for the honk rifle
2023-04-22 09:28:27 +02:00
GDN
e7a7fa82c7 makes caseless ammo GC (#20726)
* makes caseless ammo GC

* fox and ryan reviews
2023-03-29 17:27:28 +02:00
Luc
6bf5172bec Fix SM (and some other) follow links (#20554)
* hoopefully fix SM message tracking being really weird

* update some more follow targets

* Apply suggestions from code review

hehe

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Cleans up some loose ends, implements for arrivals announcer too

* Changes target to the new deactivated core

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-03-26 12:17:37 +01:00
Coolrune206
d559f2ce89 Adds the Security Laser Rifle (#20602)
* security laser rifle

* RnD magazines, yum

* "Hey Drake, where's the req_tech?"

* increases ammo count to 20. flattens magazines.

* RIP small magazines

* fixes it being unprintable, oopsies

* caseless laser rounds
2023-03-26 11:43:19 +01:00
GDN
5557f6ae32 Nukes detailed examine (#20314)
* Nukes detailed examine, converts to normal examine stuff

* THE SHOOTENING

* Update code/game/objects/structures/grille.dm

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>

* oop

* Update code/modules/mob/living/silicon/robot/drone/maint_drone.dm

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

* Update code/modules/power/apc/apc.dm

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

* Update code/modules/projectiles/guns/energy/nuclear.dm

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

* bam

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-03-17 16:20:53 -05:00
Qwertytoforty
5197d1b62a Completely reworks the tesla revolver (need to work on damage values) (#20295)
* part one: the rest of a fucking owl

* kit

* shocking changes

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

* Update code/modules/projectiles/projectile/energy.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/projectiles/projectile/energy.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Update energy_projectiles.dm

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-03-17 10:26:02 -05:00
Coolrune206
7803b0287b gives the teleporter gun an inhand sprite (#20337) 2023-03-16 13:04:02 -05:00
GDN
89a48529c1 makes crusher+accelerator upgrades gc and fixes a ghost upgrade issue (#20495) 2023-03-13 22:17:23 +00:00
GDN
626d2754d5 objective items being destroyed are now logged (#20485)
* objective items being destroyed is now logged

* signal time

* oop

* Update code/modules/projectiles/guns/energy/laser.dm

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

* Update code/game/objects/items/documents.dm

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

* mira review

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-03-08 20:15:16 +01:00
Henri215
0e6da50c3f Suppressors now can be attached to toy guns (#20415)
* Suppressors now can be attached to toy guns

* Same sound while suppressed, but lower volume

* better description

* GDN review
2023-03-04 09:44:16 +01:00
Coolrune206
a31299d49e prevents large ebows from being holstered (#20490) 2023-03-04 09:39:34 +01:00
Coolrune206
f90418d715 Re-adds the LWAP, reworked (#20401)
* re-adds the lwap

* no dual wielding snipers

* Lewcc review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Hal9000 request

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-02-25 21:19:03 -06:00
Qwertytoforty
7b47ff3a67 fixes medbeam bug (#20299) 2023-02-04 18:44:06 -06:00
GDN
7450b982d1 fixes foam dart gc issues (#20273)
* fixes foam dart gc issues

* meh
2023-02-04 18:43:15 -06:00
AffectedArc07
b34e8fa301 [READY] CI now bans files with the same name (#20195)
* CI now bans files with the same name

* Part 1

* Warriorstar python tweaks

* Part Deux

* Fix unticked

* fix
2023-02-04 16:33:41 -06:00