cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-17 13:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,784 Commits 27 Branches 2 Tags
c73dc100b0868310e6ea2f059b577689ae090bae
Commit Graph

46682 Commits

Author SHA1 Message Date
Pooble
c73dc100b0 Add ability to blacklist phrases in chat (#30902) 
* add ability to blacklist phrases in chat

* support exact

* support exact

* i think this fixes the tgui thing

* prettier linter eeeeeeeeeeee
 2025-11-23 02:56:53 +00:00
CRUNCH
9c92917dd2 Gives the Janiborg a Push Broom (and allows the janiborg combat broom to sweep) (#30820) 
* BROOOOOOM!

* Update robot_items.dm

* Update robot_items.dm

* Update robot_items.dm

---------

Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-22 22:18:53 +00:00
Ahzpy
2008eafa40 Adds a do_after when unbuckling people from wheelchairs (#31025) 
* anti bullying mechanism

* fix code sin

* Update code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm

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

---------

Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-11-22 19:43:30 +00:00
PollardTheDragon
0122cbb797 Tweaks mob mech damage, makes basic mobs handle mechs consistently. (#30842) 
* Tweaks mob mech damage, makes basic mobs handle mechs consistently.

* Extraneeous else
 2025-11-22 19:43:01 +00:00
warriorstar-orion
76c38f83e8 Revert "Adds midround event: Swarmer Infestation (#30673)" (#31078) 
This reverts commit d6ed342a6d.
 2025-11-22 19:33:08 +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
PollardTheDragon
d6ed342a6d Adds midround event: Swarmer Infestation (#30673) 
* Initial Commit

* Small fixes

* Some Linters

* Beginning AI subtrees

* Blacklists

* SwarmerEventHandler

* Better swarmer disintegration AI

* Retaliate

* SWARMERS

* Forgot one

* Linters

* More linters

* Fixes missing icon

* Step type

* Comment format

* Fixes swarmer AI subtree

* Removes damage on teleporting humanoids

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Swarmers new event system

* Projectile changes

* Spacing fix

* Dispenser fix

* No more wood

* Adjustments

* Another adjustment

* Safety

* EMP Fix

* Fixes swarmers spacing shit

* Addresses code review

* 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>

* Addresses code review

* Guard clause and index fix

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: XFirebirdX <142694283+XFirebirdX@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-11-22 00:31:59 +00:00
Pooble
9728a792fe Tweak Incriminate objective wording (#31043) 
* tweak incriminate wording

* missed the delayed text
 2025-11-21 02:30:24 +00:00
DGamerL
8710f08b5d Fixes some admin verbs (#31064) 2025-11-20 19:56:22 +00:00
Chap
91e9c9e566 [RUNTIME] Telesci console no longer runtimes trying to generate a log (#30999) 
* Tactical envirosuit helmet icon_state properly updates on reskin

* Revert "Tactical envirosuit helmet icon_state properly updates on reskin"

This reverts commit c4d10881b2.

* Telescience computer log no longer causes runtimes

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2025-11-20 10:40:30 +00:00
MixityMaxity
cc115b8be8 Makes the Large Tank Controller name consistent (#31001) 
* Renames the built computer to "large tank control"

* Renames the actual circuit to "large tank control"
 2025-11-20 10:38:44 +00:00
wixoa
e39ee7613c Remove empty for loop (#31051) 2025-11-20 06:05:29 +00:00
Pooble
c018cfe9fe Infiltrate can't be rolled twice at once (#31045) 
* make it impossible to roll infiltrate twice

* spacing
 2025-11-19 20:05:57 +00:00
Hayden Redacted
9b86a7fb82 Fixes Bluespace Harvester Running an Invalid Hydrogen Event (#31029) 2025-11-19 19:51:50 +00:00
PollardTheDragon
aad47daacc Adds retaliation to some space mobs (#30841) 
* Adds retaliation to some space mobs

* Tweaks mob mech damage, makes basic mobs handle mechs consistently.

* Revert "Tweaks mob mech damage, makes basic mobs handle mechs consistently."

This reverts commit 1e1fa43937.

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-11-19 19:41:45 +00:00
warriorstar-orion
050494fe31 ensure some ai behavior procs call parent (#30703) 
* ensure some ai behavior procs call parent

* fix slippage
 2025-11-19 19:28:45 +00:00
Ahzpy
846c5de47e [PTBF BACKEND] - Paratoberfest 2025 Rewards (#30840) 
* code n sprites

* fix spacing inconsistency

* missed a spot!

* Update loadout_neck.dm
 2025-11-19 12:36:20 +00:00
Chap
d3c7c82372 [FIX/SPRITES] Fixes a bunch of in-hand weapon sprites (#31023) 
* Fix a bunch of in-hand weapon sprites

* Correct chainsaw names

* Readd KC sprites

* Remove empty state

* Spellblade and darkblade

* Spellblade fixed

* Chainsaw fixes

* Darkblade renamed

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

Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
 2025-11-17 19:18:45 +00:00
Ahzpy
b7a1dffb78 ID Card Resprite + Job Hud Resprite (#30936) 
* cards and huds

* tsf ids

* fix contrast on pink, yellow, and paramedic IDs, new engineering icon

* test tube scientists
 2025-11-17 18:33:12 +00:00
iramoye
52bd18a1a0 i can't believe i missed this (#30932) 2025-11-17 18:31:28 +00:00
1080pCat
0012d870dc Reverts the HP of grilles back to their pre-buff state, but makes meteors take more damage from them (#30918) 
* Update grille.dm

* fully back
 2025-11-17 18:30:08 +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
CRUNCH
082b5283ad Update rpd.dm (#30973) 
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-16 11:52:42 +00:00
Migratingcocofruit
01356c6a43 Fixes turbine runtime and corrects gas throughput in the UI (#31004) 
* adds a safety to turbine log calcs

* corrects the gas throughput number
 2025-11-16 11:52:22 +00:00
PollardTheDragon
c6875a50d0 Converts spiderlings to basic mobs (#30571) 
* Converts spiderlings to basic mobs

* Address code reviews, add terror_spiderlings to isterrorspider()

* Update code/modules/mob/living/basic/hostile/spiderlings.dm

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

* Update code/modules/mob/living/basic/hostile/spiderlings.dm

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

* Breaks up ancient spiderling life into something more modern

* Fixed the brimming station of spiders

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-11-15 23:36:15 +00:00
Chap
c9cd22f47b [FIX] Reskinning the tacticool envirosuit helmet now properly updates its sprite. (#30998) 
* Tactical envirosuit helmet icon_state properly updates on reskin

* Revert "Tactical envirosuit helmet icon_state properly updates on reskin"

This reverts commit c4d10881b2.

* Reskinning tactical envirosuit now updates icon_state

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2025-11-15 21:00:11 +00:00
CRUNCH
0ce4bb4144 Filled Mop Buckets now Spawn With a Mop Inside (#30892) 
* mop

* update icon

---------

Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-13 23:50:41 +00:00
Ahzpy
0a615e798e Bridge Gone; Science Department Resprite + Drip Expansion (#30917) 
* obj sprites, human suits, vox suits, berets, softcap, loadout, vendors

* compile fix

* kidan sprites

* drask sprites + kidan uniform i missed

* xenobio merge conflict + swap robotics beret names

* grey sprites

---------

Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
 2025-11-13 23:37:20 +00:00
PollardTheDragon
0cc4014314 Kinetic Crusher Cosmetics (#30810) 
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-11-13 23:30:26 +00:00
DGamerL
0d7929f34f Mops can now clean on disarm and grab intent (#30828) 
* Mops can now clean more easily

* Also changes the janicart

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

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@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: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2025-11-13 23:23:57 +00:00
BiancaWilkson
9a8d5462ac Various skittish fixes (#30994) 
* skittish fixes

* Update code/game/objects/structures/crates_lockers/closets.dm

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

---------

Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-11-13 23:21:34 +00:00
Chap
0f2f6cdc3c Set pacifism to blacklisted for sec/com jobs. (#30995) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2025-11-13 23:08:30 +00:00
Christer2222
7615c724d3 adds xenobiology headset (#30780) 
* adds xenobiology headset

* created xenobiologist locker

* adds the lockers to maps
 2025-11-12 20:16:57 +00:00
Qwertytoforty
dbce2e9b7f needs a name now it seems (#30926) 2025-11-12 14:54:22 +00:00
Kenionatus
62f76bdcf2 fix being able to generate requisition forms without an order (#30958) 
It happened when you didn't have an account selected
 2025-11-12 14:51:14 +00:00
Christer2222
82b9b7d6b2 Fixes burning a photo inside an inventory leaving an empty spot (#30965) 
* update inventory on burn

* lint
 2025-11-12 14:50:57 +00:00
DGamerL
c5aec06e34 Fixes some objective issues (#30968) 
* Fixes some objective issues

* Update code/modules/antagonists/traitor/datum_traitor.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-11-12 14:49:53 +00:00
MymeType
a843cee85f Fix comma typo into a dot (#30929) 2025-11-12 13:09:10 +00:00
Migratingcocofruit
06f35678f6 Corrects the amount of work done by the turbine when compressing gas (#30838) 
* put in new compression cost formula

* Update turbine.dm

* Update turbine.dm

* apply compression costs before removing the gas from the tile so we use the correct pressure

* Reduces intake amount of there isn't sufficient energy in the compressor
 2025-11-12 12:53:00 +00:00
JimKil3
876bae072d Removes soul(less IPC revival) (#30747) 
* the changes

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

fuckass CI

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

* contra suggestion

---------

Signed-off-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-11-12 12:49:14 +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
1080pCat
e92a45369a yippie (#30971) 2025-11-12 09:56:11 +00:00
CRUNCH
276f28cb63 Update silicon_defense.dm (#30913) 2025-11-12 07:33:42 +00:00
Christer2222
aa536bba3a Gives ghosts the ability to spook mirrors (#30817) 
* adds behavior

* transparency test

* transparency

* mask and logic

* comments

* removed the chance for mirrors to break

* linting

* autodoc
 2025-11-12 07:22:39 +00:00
Toastical
51c47d8342 Fix compiler errors for 1670 (#30874) 
* stage 1

* hud alist

* mobs and parry

* stage ?

* we dont even need an alist here
 2025-11-11 10:38:24 +00:00
Alan
5988af9b7d Adjust hardhats, job hats, and more to fit monitor heads. (#30894) 2025-11-11 10:33:38 +00:00
Runko
d7dd053258 Adds the "breathing tube" implant to the quirk menu (#30900) 2025-11-11 10:32:43 +00:00
iramoye
9f1a329238 initial commit (#30887) 2025-11-11 10:30:36 +00:00
funglios8s
8c234a00f0 Gives Xenobio access to science clothing in the loadout (#30961) 
* gives xenobiologists access to science clothing

* Apply suggestions from code review

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

* Update code/modules/client/preference/loadout/loadout_uniform.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-11-11 10:25:38 +00:00
JimKil3
b61cc19628 fix (#30955) 2025-11-10 18:14:05 +00:00