Commit Graph

1552 Commits

Author SHA1 Message Date
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
DGamerL
121603c825 The sleepy pen, hypospray and RSG will now all do initial chemical reactions when they inject a chemical (#21722)
* fuck it we ball

* I hate math

* Updates people, updates (also jimkil review)

* okay this should work better

* Will it work?
2023-08-12 18:41:28 +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
Charlie
5ccd8241c4 homing projectiles + wizard spell (#21752) 2023-07-24 15:52:17 +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
GDN
6ffbe49973 stamina damage logging (#21576)
* stamina damage logging

* use a gun

* bam
2023-07-17 15:21:28 +01:00
larentoun
575a83b732 fix: Pulse damages machinery too (#21667)
https://github.com/ss220-space/Paradise/pull/2433
2023-07-17 11:03:14 +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
GDN
6872e5257d you can now reload 357 revolver speedloaders from ammo boxes (#21269) 2023-07-07 13:57:22 +01: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
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
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
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
AffectedArc07
48b0210064 [READY] Widescreen (#20861)
* TM Needed - Widescreen

* A lot of fixes

* TM notice

* Feedback thread

* Minor tweaks

* Expans silicon view stuff

* Fix viewmods

* The preferential option

* Why were these global

* Fix clickcatch sizing, fix parallax issues

* Maybe fixes the runtime

* READY
2023-06-07 21:09:16 +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
7c5c2f9117 empty ammo no longer runtimes on EMP (#21188) 2023-06-02 19:53:01 +01:00
S34N
bdb8039c8f Adds gorillas and cargorillas (#20830)
* goril

* goril2

* arms

* goril3

* goril4

* rampaging

* emote

* trait

* more gorilla

* ooga

* Magillitis Serum Autoinjector, crates

* return to monke

* remove unused trait

* oops

* sirryan

* earth

* Update code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm

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

* Update code/modules/reagents/chemistry/reagents/misc_reagents.dm

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

* fixes and stuff

* gorilla text clarification

* tweak probs, stop if dead

* volume

* gorilla sleeping attack

* Apply suggestions from code review

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@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: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
2023-06-01 18:36:07 -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
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
S34N
6bb5674928 fixes (#20713) 2023-03-25 21:41:28 +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
Coolrune206
9838d84023 makes lasershot spread smaller (#20606) 2023-03-14 23:33:44 +00:00
GDN
ed4dda70fb fixes a forcebolt runtime (#20501)
* fixes a forcebolt runtime

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

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

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-13 22:18:47 +00: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
Luc
9ba005de9f Add themselves as a pronoun helper, fixes some usages of it (#20184)
* Add themselves helper

* Testing and replacing

* Fixes some non-standard usages
2023-01-20 19:28:48 -05:00
GDN
50a73339b2 powered crossbow fixes (#20256) 2023-01-20 19:18:21 -05:00
matttheficus
9d199a8f64 Limits Telegun to Current Z-Level (Unless a Beacon is Emagged) (#20097)
* Update telegun.dm

* i am bad at logic I got a 72% in the class

* im bad two electric boogaloo

* Caps Moment

* Update telegun.dm

* I cant code, this finally worked

* TC update

* Update special.dm

* it works, yipee

* Sirryan review

* safety is good

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-01-19 15:10:13 -05:00