cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-15 20:12:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,812 Commits 27 Branches 2 Tags
b29d968148083f5beffc9a7a89e271c57c8eb044
Commit Graph

29204 Commits

Author SHA1 Message Date
Alan
b29d968148 Add 23 new drinks; update bar manual. (#31026) 
* Add 23 new drinks; update bar manual.
- Add three new drinks that use the beet shrub and their effects
- Add nine new synthanolic drinks and their effects
- Add two new soft drinks for both synthetic and organic customers, and their effects
- Add 10 new soft drinks for synthetic customers and their effects
- Add decals for reagent splashes and drips
- Update bar manual to include these drinks as well as all other mixed drinks currently on the wiki
- Add new sprite for welding fuel in a glass to reflect the liquid's color instead of Dr. Gibb
- Add chemistry recipes to mix electrolytes
- Change Robot Tears' drink difficulty to easy, to reflect the loss of ubiquitous oil tanks
- Add many, many puns, both visual and in written text

* Thanks, linters!

* Thanks, linters! (part 2)

* Thanks, linters! (part 3)

* Incorporate review suggestions.
- Add reagents to the zero day drips
- Rewrite many if statements to be early returns/continues
- Use nutrition defines
- Make hard and soft reset also purge themselves (my choice)

* Update dryer martini sprite to match proposal #31050

* Incorporate review suggestions.
- Remove reagents, weren't needed.
- Make sure basecolor is applied.
- Convert more if-blocks to early returns.
- Adjust spacing in function calls to match standard.

* Implement whitespace suggestions from review.
 2025-11-26 21:24:06 +00:00
Alan
ae642762fc Resprite martini glass drinks, cherry shakes, puddings. (#31050) 2025-11-26 20:13:35 +00:00
warriorstar-orion
a853bc2e84 fix ai controller debugger UI state (#31125) 2025-11-26 17:32:23 +00:00
PollardTheDragon
088f038e68 Incursion Expansion and Rebalance (#30835) 
* Adjusts spawn times

* Incursion Adjustment Part 1

* Skelecurity

* Skeleton Officer and Mobster

* Skeleton mob drops

* Rattle em

* New mobs, AI, removed volatile

* Nerfs spider

* Trait

* Config fix

* Nerfs juggernauts

* Rune effect while reanimating

* Linters

* Fleshspider Retaliate

* Update skeleton_mob.dm

* Projectile changes

* Event tracker for giant spiders and better tracking for skeletons

* Oops

* Linter

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

* Lints

* Small fix, tries to revive the original player first before selecting dchat

* Linters

* Fixes mobs not gibbing often enough

* Improves incursion rally, undeerifies it

* Oops

* Update incursion_ai.dm

* Removes incursion skeletons from xenobio mobs

* No gold core flesh spiders

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2025-11-26 00:25:15 +00:00
Alan
07074ec6fe Proof of concept/proposal: Add page-seeking URL capability to books. (#31007) 
* Add page-seeking URL capability to books; Update bar manual.

* Capitalize all instances of 'back to Table of Contents'
 2025-11-25 21:25:24 +00:00
PollardTheDragon
0cfe0594be Refactors slaughter, shadow, and pulse demons to basic mobs (#30660) 
* Refactors slaughter, shadow, and pulse demons to basic mobs

* Linters

* Fix

* Projectile changes

* Ensures demons speak common

* Update code/modules/mob/living/basic/hostile/demons/demon_powers.dm

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

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@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-11-25 19:47:12 +00:00
Pooble
989ff989d6 make cereal maker wrenchable (#31053) 2025-11-25 19:17:19 +00:00
Toastical
b271ad42a6 fix hijack showing as traitor on antaghud (#31105) 2025-11-25 19:14:44 +00:00
CRUNCH
ef74d4ee5f Allows the Trader Shuttle to be Manipulated by the Shuttle Manipulator + Very minor other trade shuttle content (#30849) 
* A surprising number of file changes, this needed.

* lateload wooo

* Update centcomm.dmm

* Update centcomm.dmm

* Update shuttles.dm

---------

Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-25 14:57:30 +00:00
Toastical
b38b0203bc Fix mech crusher and mining bombs not working on basic mobs (#31085) 2025-11-25 14:23:49 +00:00
iramoye
a4a5dea72a Replaces the Kidan scream audio (#30890) 
* found a bug under my bed HELP

* Attributions update
 2025-11-25 14:23:13 +00:00
PollardTheDragon
90ba9bcc80 Adds null checks to global terror spiderling list (#31093) 
* Adds null checks to global terror spiderling list

* Little cleaner

* Even better
 2025-11-23 20:46:12 +00:00
Seren Highwater.
dc88571fce Adds cargo pants to clothing vendor and loadout. (#31017) 
* done

* done2

* fix config oopsies

* greynvoxfix
 2025-11-23 06:27:58 +00:00
HMBGERDO
4861388c80 Surgical drapes now actually prevent infections (#31034) 
* this didnt work since it was added

* removing unused variable

* this one here too
 2025-11-23 03:26:30 +00:00
CRUNCH
893187c9fc Update posessed_object.dm (#31019) 
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-23 03:19:05 +00:00
Alan
6192180e4f Tweak new soft drink effects. (#30979) 
* Tweak new soft drink effects.

* Apply suggestions from code review

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

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-11-23 03:06:59 +00:00
CRUNCH
4dd9b3f0d5 Allows inflatable barriers to be printed. (#30970) 
* Update autolathe_designs.dm

* Update code/modules/research/designs/autolathe_designs.dm

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

* commit inflation

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
 2025-11-23 03:03:57 +00:00
chuga-git
4e86b993c9 unfuck my branch (#30925) 2025-11-23 02:57:29 +00:00
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
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
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
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
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
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
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
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
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
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