cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-09 22:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,626 Commits 10 Branches 2 Tags
master
Commit Graph

1038 Commits

Author SHA1 Message Date
PollardTheDragon 4d5b0e1286 Crashed Vulpkanin Ship - Lavaland Ruin (#32110) 
* Charon's Revolver

* Dog tags

* Ash Whelps

* Ash walkers and resist adjustment

* Some providence stuff

* Minor wording adjustment

* Desc change

* Ruin, salvage, and ruin assets

* linters

* Mo linters

* quick

* Various fixes

* Variety of fixes

* Update

* Naming

* FIX
 2026-06-24 22:37:10 +00:00
PollardTheDragon 5a446efbec Adds 'Prospector' Mining Turrets (#32108) 
* Adds 'Prospector' Mining Turrets

* Linters
 2026-06-24 22:17:48 +00:00
PollardTheDragon 849e33e147 Adds dueling pistols (#31772) 
* Adds dueling pistols

* Bonus damage for dueling

* Oops

* Sprite stuff

* Sprites and fixes
 2026-04-09 20:45:31 +00:00
PollardTheDragon 87c2a19ecd Adds Mafia Boss Syndicate Kit (#31701) 
* Adds mafia boss syndicate kit

* Comment update

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

Co-authored-by: Miles <116982774+Burzah@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Miles <116982774+Burzah@users.noreply.github.com>
 2026-03-29 02:17:15 +00:00
anokspy 6d2554cd39 le fix (#31719) 2026-03-11 07:09:20 +00:00
MixityMaxity c4fb9bff75 Adds seven alternate finishes for the .357 Revolver (#31668) 
* Adds Syndie Subtype and extra finishes

* Switches all mentions of standard revolver to the new syndicate version

* Wait why are we spinning the *barrel*

* removes duped name and description
 2026-02-27 19:07:58 +00:00
iramoye bcbbb1671a grammar fixes two disable guns (#31532) 2026-02-08 05:10:02 +00:00
PollardTheDragon aa41bae2b7 Fixes minigun autofire wonkiness (#31616) 2026-02-07 23:07:47 +00:00
PollardTheDragon 887b3348c0 Adds IK-134 laser gatling gun (#31483) 
* Adds IK-134 laser gatling gun

* Attack chain

* Fixes spread

* Linter

* Apply suggestions from code review

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

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

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
 2026-02-06 00:25:04 +00:00
CRUNCH da1ebd039d Adds Materials to Every Autolathe and Protolathe Item (except for ammo boxes, IK mags, and Dart Boxes) (#31445) 
* Holy fuck there's so much shit I'm not even done

* oh god there's so many

* it is done

* Update autolathe_designs.dm

* Update circuitboard.dm
 2026-01-30 21:25:40 +00:00
Toastical 4c74b78a18 migrate all /obj/item from /New() to /Initialize() (#31232) 
* migrate all /obj/item from /New() to /Initialize()

* move GLOB.chemical_reagents_list creation to /world/New()

* review

* oops

* autodoc a smart var
 2026-01-28 19:44:32 +00:00
PollardTheDragon 74d723496f Adds Paintball Guns (#31184) 
* Paintball Guns

* Linters and cleanbot

* Fixed examine text

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

* Fixes decals

* Update code/game/objects/effects/decals/Cleanable/misc_cleanables.dm

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

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

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Spans

* Clean code fix

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Removes excess cut

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-26 22:12:03 +00:00
kyunkyunkyun b0463d3c83 Convert most spans to defines (#31080) 
* spanish?

* aaaagain

* keep maptext

* Update robot_items.dm

* Update span_defines.dm

* compiles

* Update silicon_mob.dm

* compile
 2025-12-13 23:55:48 +00:00
Ahzpy 9ef057533b Resprites some High Value Items (#30956) 
* defibs and lasers

* linters

* design

* fix missing sprites
 2025-12-04 09:12:30 +00:00
1080pCat 2f030bd8e7 you cant outrun a radio (#31122) 2025-12-03 17:39:57 +00:00
PollardTheDragon 727a42321e Adjusts damage mod on PKShotgun and PKRepeater (#31138) 
* Adjusts damage mod on PKShotgun and PKRepeater

* Rounding
 2025-11-30 22:08:20 +00:00
PollardTheDragon b6ea6d5cc0 Fixes new PKA guns having no inhand sprite (#31097) 2025-11-30 22:08:03 +00:00
PollardTheDragon a6359ea097 Ports new Proto-Kinetic Guns (#30813) 
* Ports new Proto-Kinetic Guns

* Linters

* Spellcheck

* Update kinetic_accelerator.dm

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Projectile changes

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-11-22 19:32:59 +00:00
CRUNCH 357a772b6f Converts the Gamma Armoury Into a REAL Shuttle + Extra Gamma Armoury Content (#30847) 
* Thank god it's actually a real shuttle now

I hate the gamma armoury so much.

* Update shuttle.dm

* preset docking ports woo

* named ports

* Update shuttle.dm

* lateload woo!

* god

* Update misc_admin_procs.dm

* Update SSshuttles.dm

* Update misc_admin_procs.dm

* Apply suggestions from code review

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-11-17 18:26:07 +00:00
kyunkyunkyun f96b26b75a /obj/item/projectile --> /obj/projectile (#30411) 
* yers

* vars

* map changes

* some comments (clearly not stolen from items)

* fix component

* summary
 2025-11-12 10:23:20 +00:00
Qwertytoforty a58bdc8968 Caps the eshotgun damage multiplier from lens to 1.5 (#30663) 2025-10-19 19:25:12 +00:00
kyunkyunkyun 8b0c249d97 Fixes some laser guns inhands (#30445) 
* fix inhands

* explanation
 2025-09-27 08:48:00 +00:00
kyunkyunkyun 83509c3967 Some more armor tweaks (#30398) 
* summary

* (required)

* undef

* oh this is unused, nice

* ok but.. why

* a tiny bit more

* Update human_defense.dm

* Update mass_hallucination.dm
 2025-09-19 15:43:42 +00:00
kyunkyunkyun 8821ab9a66 Updates a couple of /obj/item variables (#29829) 
* compiles checkpoint

* fix some

* updatepaths

* fix

* rrr

* linters

* fiexs

* icon fixes

* plasmemes

* fix

* fix

* fix bit more

* fix

* well

* cleanup

* fix glasses layer

* conflict

* fuck gun code

* fixes

* fix

* fixes to energy guns

* review

* conflict

* support that 1 unathi pixel

* fix
 2025-09-14 15:23:56 +00:00
Contrabang 5b368c3f8f Renames some pre_attack arguments (#30324) 
* Renames some pre_attack arguments

* fix
 2025-09-04 07:11:59 +00:00
Contrabang e1f42f4673 pre_attack change (#30305) 2025-09-01 21:10:58 +00:00
kyunkyunkyun 626eaaeb79 Removes british spelling of armor from armor_penetration vars (#30104) 
* spelling

* manually rename last armour pen

* Update code/game/objects/obj_defense.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>

* Update goldgrub.dm

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-09-01 04:27:52 +00:00
CRUNCH be2f874e76 Removes crap, upgraded, and upgaded+ cells. Buffs the capacity of basic cells. (#29958) 
* Purgation complete

* Update cell.dm

* duplicated descriptions

* subtyping

* Update cell.dm

* Loot

* Update misc_spawners.dm

* Update misc_spawners.dm

* Update code/game/objects/effects/spawners/random/misc_spawners.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update cell.dm

* Update code/game/objects/effects/spawners/random/misc_spawners.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/modules/power/cell.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-08-26 01:38:33 +00:00
PopeDaveThe3th 42d07892c9 Resprites Bullets (#30011) 
* boolet

* when the lint is er

* almost

* there we are

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
 2025-08-24 03:31:43 +00:00
Bak Bak 8ee5fbb7d4 Proto Kinetic Pistol Sprite Updates + Flashlight Tweak (#29942) 
* a bit of love for explorers

* remove identical call for can_flashlight
 2025-08-10 18:34:34 +00:00
Contrabang 5f7b650401 Fixes for #29996 (#30005) 2025-08-10 14:34:04 +00:00
PopeDaveThe3th 6dff434902 Ports TGMC Pistol + Pistol Magazine + Attachment Sprites (#29768) 
* let's fuckin go

* aps cleanup

* one word

* attachments file

* license nonsense

* almost forgor

* error fix

* second fix

* please free me from this hell

* AHHHHHHHHHHHHHHH

* please just end already

* please

* for fuck's sake

* just work already you little shit

* FUCK

* the suffering does not end

* there can't be many more

* license

* rollback 1

* rollback 2

* license move

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

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

* contra change

* rollback

* contra change 2.0

* Update README.md

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

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

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

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

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

* more contra changes

* whoops

* daedalus

* few more

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

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

* more contra edits

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

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

* that was annoying

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

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

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2025-07-29 22:30:45 +00:00
Contrabang a57a8b8c40 Adds CI to error on unnecessary variable modification (#29861) 
* begin the burndown? (y/n)

* okay update requirements?

* change the error name

* there we go

* tweak

* first bit of the burndown

* more

* burndown complete

* return the exit code!

* review

* Revert "first bit of the burndown"

This reverts commit 34155bd991.

* fix

* fixes

* last fix

* remove deprecated avulto stuff
 2025-07-27 22:26:13 +00:00
Contrabang 1504ed98be massive burndown (#29894) 2025-07-27 20:52:39 +00:00
PollardTheDragon 46b5f36ec9 Shotgun change (#29670) 2025-07-15 21:08:05 +00:00
Contrabang 1f124ac835 Refactors beams. Adds tethering. IV drips/bags are now tethered. (#29570) 
* refactor

* tether

* tetherrrs

* logic fix (i hope)

* ci fix

* ok please work
 2025-07-09 14:49:40 +00:00
chuga-git 04b81c360c Nerfs ERT IK carbine fire rate, fixes automatic_fire component rounding error (#29645) 
* Fixes rounding error in automatic_fire component, nerfs lasercarbine fire rate

* Update code/modules/mob/living/carbon/human/human_mob.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/human_mob.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
 2025-07-04 19:26:12 +00:00
PollardTheDragon b7c2f80dc4 Adds Lever Action Laser Rifle - The Model 2495 (#29502) 
* Adds lever action laser rifle

* Grammar

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Sound adjustments, delay adjustments

* Increased cell capacity to make it more compatible with smith lenses

* Compatibility with fire rate lenses

* Reduced base cycle time to 1 second from 1.5

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
 2025-07-04 19:03:40 +00:00
Toastical 0c74c96e2f improve kinetic accelerator log (#29660) 2025-06-20 18:11:38 +00:00
ike709 6d1f7fdcbc Fix a var type declaration (again) (#29637) 
Signed-off-by: ike709 <ike709@users.noreply.github.com>
 2025-06-16 13:50:23 +00:00
warriorstar-orion e63415a483 port minebots to basic mobs and add some behavior (#29319) 
* port minebots to basic mobs and add some behavior

* remove unused define

* update is_blocked_turf usage

* fix radio, goldgrub, and armor upgrade

* standardize blackboard names

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* lewc review

* whoops

* Apply suggestions from code review

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-06-13 19:48:40 +00:00
CRUNCH 3c80dcf246 BSG Extended Description no Longer Lies to You (#29351) 
* Update special_eguns.dm

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update special_eguns.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2025-06-04 13:08:59 +00:00
Osetrokarasek 0e06151754 More Silly Crates (#29310) 
* bleh

* blah

* bluh

* Update folders.dm

* Update pack_miscellaneous.dm

* baba

* bebe

* bobo

* Increased energy use per shot for fake egun

* Update code/modules/clothing/suits/misc_suits.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

---------

Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-06-04 13:00:35 +00:00
iramoye 2caf7e988e Adds Instakill Rifle close examine text (#29128) 
* Added examine text

* god help me

* i did it

* examine text change

* fixes two words

* i missed one letter

are you kidding me. changes "lense" to "lens"

Signed-off-by: iramoye <projecteternal1@gmail.com>

---------

Signed-off-by: iramoye <projecteternal1@gmail.com>
 2025-05-17 13:58:27 +00:00
PollardTheDragon 35f4b7a41a Smith Polish: Another Fire Rate Fix (#29168) 
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-05-17 13:10:33 +00:00
Qwertytoforty 7bd8293673 Update kinetic_accelerator.dm (#29326) 2025-05-15 07:36:39 +00:00
PollardTheDragon b4cf38fb3f Smith Polish: Fast-Click Lens Durability Fix (#29205) 
* Fixes lenses taking too much durability damage

* Better fix
 2025-05-13 04:56:44 +00:00
Taurtura c74541cf8d Fix kinetic accelerator desc taking up half your chat when it has modkits inside it (#29122) 
* The Fix

* remove extra empty line
 2025-05-07 22:27:57 +00:00
azulez c826924ead Added a few non-lethal SHAME suicide paths for the disabler. (#29038) 
* Added a few non-lethal SHAME suicide paths for the disabler.

* Spelling fix, spacing fix per suggestion.

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

Not sure how this snuck back in.

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-04-24 15:00:06 +00:00
PollardTheDragon 56136a4d1a Fixes eshotgun dual-wield (#28950) 2025-04-10 02:43:55 +00:00