DGamerL
e3c73110db
Adds Chemical flamethrowers ( #25091 )
...
* Initial work
* Good enough to open a PR out of draft
* Make these use the vars on the flamethrower
* Moar fixes
* Undefines define
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
* This won't compile
* GDN review
* Fixes CI
* Fixes CI even more
* 5 ammo per tile now
* Heavily nerfs adding multiple fires
* Adds phlogiston as a burnable reagent
* Fixes the fire name
* Placeholder sprite + ammo use fix
* Now in cargo partially
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Lewc Review
* Adds nuclear variant
* Adds the chem flamethrower to the nukie uplink, alongside ammo
* More fire armor tweaks
* GDN review
* Update code/modules/reagents/chemistry/reagents/pyrotechnic.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* TEMPORARY PUSH
* Adds inhands
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Fixes inhands
* Makes air hot again
* Lewc review
* Audible messages and canister refilling
* Update code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-09-05 23:12:56 +00:00
PopeDaveThe3th
58c7fa9a0d
Fairly Sizable Fed Lore Drop ( #26600 )
...
* the fedening
* Federation -> TSF
* Update outfit_admin.dm
* Update outfit_admin.dm
* i forgor
* few more
2024-09-03 13:04:56 +00:00
DGamerL
44671e31e8
Adds: The C-Foam launcher ( #25738 )
...
* The start
* Getting a bit further
* Slight ammo casing update
* Istype helper and foam blockage
* Adds status effect
* Foam blockage and status effect fixes
* Autolathe ammo + stun
* aaaaaaaa
* Adds uplink item
* Actual slowdown
* Makes attacking a bit faster again
* Ammo increase to 12
* Sirryan review
* Adds sprites - almost working
* Lots of fixes + mineral doors
* Mineral doors don't open with foam
2024-08-01 06:24:09 +00:00
Marm
0d1eb5110d
Adds Holy Water Darts to Cargo ( #25468 )
...
* die monster you do not belong in this world
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* Update code/modules/projectiles/ammunition/ammo_casings.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
---------
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
2024-05-30 15:57:35 +00:00
Qwertytoforty
50851d7958
fix full auto on certain guns with double click speed ( #25520 )
2024-05-25 01:18:51 +00:00
Qwertytoforty
f0209d975b
ion scatter gets 2 more pellets and 5 degrees more spread ( #25269 )
...
* ion scatter gets 2 more pellets and 5 degrees more spread
* mech ion as well
2024-05-01 23:46:42 +00:00
Qwertytoforty
a50683ef28
Adds the SPRK-12 Energy Pistol ( #24869 )
...
* Adds the SPRK-12 Pistol
* I Was improper and forgot to name it right
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* check it
* Update gun.dm
* less copypasta
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* early return
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
2024-04-28 22:03:14 +00:00
PopeDaveThe3th
5b8ae44d03
whoops ( #25268 )
2024-04-25 19:14:31 +00:00
GDN
9e6dcf9c46
removes the remaining datum redeclares ( #25220 )
...
* removes the remaining datum redeclares
* the two fixes
* finneee contra
* OK CONTRA
* readd
* CURSED TO BE BROWN!
* facking automerge
2024-04-21 18:26:35 +00:00
PollardTheDragon
41469cfa06
Evil Cyborgs - Non-Engineer Emag/Malf Modules ( #24638 )
...
* Evil Janitor Cyborg
* Evil Medical Cyborg
* Little less cyanide
* Evil Service Borg
* Combat Cyborg Firmware Upgrade cost adjustment
* Minor code fixes
* Updated Energy Type
* Spacing Changes
* Evil Mining Borg pt1
* Sonic Jackhammer Force, Functions as Combat and Utility mining module
* Moved guitar
* Moved KA
* Naming, Inheritance changes
* Fix landmine stack icon
* Landmine Repath, RSG Magazine Length and KA Overheat changes
* Service Borg Shotgun - Lasershot, Ammo Cap Nerf, No more slug
* REALLY got rid of compact slugs
* RSG - 2u Toxin, 20 Brute heavy syringes
* Syringe Gun Fire Rate
* Changed syringe creation, moved syringe cannon off syringe gun
* Purged syndie hypo, new emag hypo pierces armor/suits
2024-04-12 19:08:48 +00:00
Contrabang
e32544e599
#undef is now required for all file defines ( #24091 )
...
* CI
* undef
* hooooly crap
* yeah
* false by default
* fixes
* alright, there we go
* oops lmao
* lol, lmao even
* proper programming
* fix
* losin my mind
* oops
* yeah coloring
* WE LOVE MULTIPLE DEFINES (ive lost my sanity)
2024-03-11 14:03:30 -04:00
Marm
4f6664e058
Reduces Autolathe cost of E-Revolver Chargepacks ( #24406 )
...
* a little cheaper
* gosh that's an infinite metal glitch
2024-03-10 18:15:47 +00:00
warriorstar-orion
0667f20681
move all EOL comments on typepath names to dmdoc ( #23928 )
...
* move all EOL comments on typepath names to dmdoc
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2024-03-01 20:05:49 +00:00
PopeDaveThe3th
7c0ce05aae
Adds names and descriptions to most bullets and ammo boxes ( #24363 )
...
* Adds names and descriptions to most bullets
* Update code/modules/projectiles/ammunition/ammo_boxes.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update ammo_boxes.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* desc updates
* word changes
* Update ammo_casings.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update ammo_casings.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-03-01 12:49:23 +00:00
Marm
f016100149
But what if I don't want to kill people? Disabler SMG Port. ( #24107 )
...
* i joined the force to help people
* disabler i hardly know her
* Update code/modules/projectiles/ammunition/energy_lens.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* oops
* Update code/__DEFINES/lighting_defines.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/modules/projectiles/guns/energy/stun.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/modules/projectiles/guns/energy/stun.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/modules/projectiles/guns/energy/stun.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/modules/projectiles/guns/energy/stun.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/projectiles/guns/energy/stun.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-03-01 12:03:26 +00:00
Coolrune206
8f9035d1ed
reverts portable emitter hitscan ( #24078 )
2024-02-14 19:46:40 +00:00
datlo
97f46ffe84
Refactor and rework the staff of chaos ( #23472 )
...
* [WIP] Refactor and rework the staff of chaos
* update lists
* Add trick weapons
* rename damaging effect, more stuff
* add chaos wand
* implement gift spawning, css, disco, wand
* string tweaks, prank toys
* tweaks + bonus soul
* tweak
* add prank revolver
* fix
* tweak
* implement lethal effects + tweaks
* string tweaks
* implement negative effects
* implement remaining effects
* remove leftovers
* non carbon handling
* non-human handling
* wand human check
* clean up
* Balance
* remove test comment
* remove debug chaos items
* add message to dead check
* clean leftovers
* review suggestions
* Update code/modules/projectiles/guns/chaos_bolt.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Apply suggestions from review
* oh and that one too
* Update code/modules/projectiles/guns/projectile/revolver.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* documentation fix
for some reason chaos_bolt has a bunch of changes not in the git
* add css classes
* recompile css, fix food
* recompile tgui
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* invoke async proc ref
* adress code review
* fix conflict
* rename var
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2024-02-04 21:32:10 +00:00
Qwertytoforty
e8b13b38cb
Purges improvised and overloaded improvised shotgun ammo ( #23739 )
...
* Purges improvised and overloaded improvised shotgun ammo
* order order tape recorder
2024-01-14 12:34:26 +00:00
Sadhorizon
f65d120711
Nerfs the basic plasma cutter. Yep. ( #23071 )
...
* Who would ever expect a basic cutter nerf?
* temporary paramedic fix - they get a drill
2023-11-12 20:11:34 +00:00
Qwertytoforty
357c62b6d7
Ports hitscan from TG, adds it to *SELECT* things ( #22754 )
...
* this was just going to be a plasma cutter change but no had to make it look good, whats next, ai sat turrets (yes)
* ai turret
* Coca cola, don't forget the ice. Or the pulse
* almost done, pull master than map edit
* we ball
* ah, chasms.
* it's for the best. Fuck should not sleep checker though
* hitscan reflection limiting system
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* c-c-c-changes
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2023-11-01 20:05:27 +00:00
Luc
c8456810d8
marks cap guns as harmless ( #22572 )
2023-10-01 11:42: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
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
Qwertytoforty
bcce813e0a
Beanbag shot now throws a tile. Increases the spread on rubbershot / lasershot / weakbuckshot ( #21501 )
...
* Beanbag shot now throws a tile. Increases the spread on rubbershot / lasershot / weakbuckshot
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* makes it compile, uses starting.
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-08-11 15:35:16 +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
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
DGamerL
887a5111df
Adds confetti shot ( #21462 )
...
* CONFETTI CANNON
* proc and contra review
* sprite names
* nukie uplink and lewcc suggestions
* chemical fixed
* fixes party drums cost and chem explosion sound
* Henri review
* renames a datum because I copypasted shit
* changes a name because I copy pasted
* removes an extra space
* things I forgot + bundles + recipe change
* Oopsie + tones down the volume of confetti
2023-07-07 13:44:55 +01:00
GDN
4a82fe1a8a
buffs cyborg emmitters ( #21399 )
2023-06-28 14:31:47 +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
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
Samman166
49b26c4eba
WT Rework and Nerf ( #20536 )
...
* Reworks and nerfs WTs
* Removes some duplicate comments
* Makes WT ammo box's normal sized items because I forgot to at first
* Adds a var to WT mags to check if they are being loaded to prevent people from queueing up multiple reload processes at once
* Sanity checks work properly now
* Implements changes requested, empty magazines now available from RND, ammo crate contains 5 full magazines, mag size set back to 20, magazines made normal sized items and fit in assault belt
* Update code/__HELPERS/mob_helpers.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/__HELPERS/mob_helpers.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Magazines fit in security webbings
* I forgot a comma
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* Applying various reviewer suggestions
* Applies various suggestions
* removes moving_do_after now that its a param
* Apply suggestions from code review
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* solves the merge conflict hopefully
* step one of trying to fix conflict again
* step two hopefully fixes conflict
* Delete ammo.dmi
* Merge branch 'master' into wt-rework
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* Applying various reviewer suggestions
* Revert "Applying various reviewer suggestions"
This reverts commit 7081e9aa2b .
* Revert "Apply suggestions from code review"
This reverts commit 96dab4f8b8 .
* Revert "Merge branch 'master' into wt-rework"
This reverts commit 6906a67654 .
* Merge branch 'master' into wt-rework
* please god work
* Update code/modules/projectiles/ammunition.dm
* Update code/modules/projectiles/ammunition/magazines.dm
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2023-05-25 18:41:56 +02:00
Qwertytoforty
2517851800
Nerfs laser rifle ammo size and emp proofness. ( #21082 )
...
* Nerfs IK ammo size and emp proofness.
* description / emp
* Update code/modules/research/designs/weapon_designs.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Update code/modules/projectiles/projectile/beams.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2023-05-22 22:25:03 +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
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
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
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
9838d84023
makes lasershot spread smaller ( #20606 )
2023-03-14 23:33:44 +00: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
warriorstar-orion
a7d09cf033
Whitespace cleanup part 2. ( #19891 )
2022-12-24 18:38:43 +01:00
S34N
f0c884c08f
357_box ( #19845 )
2022-12-07 21:09:09 -05:00
Octus
d2e03e7d1f
Update energy.dm ( #19593 )
2022-11-09 19:30:37 +00:00
Coolrune206
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
Stokes52
39b5d3462d
Adds new ERT laser carbine item and inhand sprites ( #19512 )
2022-11-02 21:10:45 +01:00
Coolrune206
447edfdf83
converts laser slugs to laser scatter shot ( #19552 )
2022-11-01 20:51:08 +01:00
Qwertytoforty
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
Vi3trice
20c437f7d2
linters do your magic ( #19263 )
2022-10-10 20:58:41 +02:00
Contrabang
8418997ed8
Moves most screwdriver checks to screwdriver_act ( #19024 )
...
* screwdriver_act my beloved
* convert to returns instead of . / lewcc review
* it will be done
* i'm a little bit stupid, but now time to test
* sometimes I get excited and press the commit
* The great test has been completed
* oh wow oh wow, lewc review
* found one last one
* Steel review
* Lewc review
* quick sirryan review
* removes stupid comments (old coders I blame)
* sirryan review two
* whoops...
* hal review
* the fix to the fix to the fix
* Revert "the fix to the fix to the fix"
FUCK I pushed to the wrong branch
This reverts commit a96fe98781 .
2022-10-06 09:30:33 +01:00