cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 07:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,284 Commits 26 Branches 2 Tags
626eaaeb7936ab802fd6148cf9751c2f55bcb3d2
Commit Graph

28899 Commits

Author SHA1 Message Date
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
3216ab1c00 Updates Holy Water to be Less Annoying and More Flavourful (#30154) 
* Update water.dm

* Update code/modules/reagents/chemistry/reagents/water.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: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-09-01 04:27:20 +00:00
Toastical
a3fcb03a7a fix tamed slimes being repeatedly tameable (#30332) 
* fix tamed slimes being repeatedly tameable

* move if check
 2025-08-30 19:48:36 +00:00
PollardTheDragon
58865cd52a Fixes gutlunch targeting (#30331) 2025-08-30 14:32:18 +00:00
Contrabang
d5a9797cb4 bam (#30322) 2025-08-29 16:34:15 +00:00
Chap
b079617adc [FIX] Extinguishing someone else gives the right message (#30319) 
* Send self message to the right person

* Change visible message to the right target

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2025-08-29 11:43:17 +00:00
Migratingcocofruit
4801aa4579 Increases temp threshold and reduces animation time for HE pipes (#30314) 2025-08-28 20:58:56 +00:00
SchrodingersWolf
f3575712a6 Adds some more checks to make surgery computers (#30093) 
work on cavity surgery again
 2025-08-28 20:33:20 +00:00
Chap
d4303b92fd Flash implant uses correct button icon (#30304) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2025-08-28 15:46:56 +00:00
kyunkyunkyun
f6e682a6d7 armor defines (#30115) 2025-08-28 14:58:07 +00:00
Kyani
5439988d5e Warp cubes require do_after on station (#30132) 
* Warp cubes require do_after on station

* grammar

* Update code/modules/mining/lavaland/loot/tendril_loot.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/modules/mining/lavaland/loot/tendril_loot.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-08-28 14:57:37 +00:00
Contrabang
082f8d3d86 better buildmode say logging (#30257) 2025-08-28 14:54:08 +00:00
Kyani
ee6e804320 adds verb returns (#30226) 2025-08-28 14:51:42 +00:00
PollardTheDragon
a3d9ecf4c9 Fixes gutlunch controllers (#30277) 2025-08-28 14:48:38 +00:00
Contrabang
4a93c96791 fix abductor surgery (#30302) 2025-08-28 12:03:41 +00:00
Chap
97a4e8ebd9 Fix buildmode tilt TGUI runtimes (#30301) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2025-08-28 11:44:50 +00:00
CRUNCH
6bf1906823 Fixes potatoes not becoming potato batteries (#30251) 
* Update potato.dm

* e
 2025-08-27 20:06:27 +00:00
Chap
918c267e43 [FIX] Xenobio console runtime (#30266) 
* Check if recycler exists

* Update code/modules/research/xenobiology/xenobio_camera.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
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: warriorstar-orion <orion@snowfrost.garden>
 2025-08-27 19:29:49 +00:00
Osetrokarasek
a9a8fd6233 muvgth (#30139) 2025-08-26 01:51:47 +00:00
warriorstar-orion
e3c177e27b fix more duplicate procs (#30232) 
* fix more duplicate procs

* gah
 2025-08-26 01:51:17 +00:00
Osetrokarasek
97047c3bb9 Emptying Lathed Welding Tools And Extinguishers (#30137) 
* asfgdsa

* cnrbangn rqerqest chaengs...
 2025-08-26 01:49:10 +00:00
Kyani
95f388e795 Makes some wizard disease admin-spreadable (#30133) 
* Makes some wizard disease admin-spreadable

* remove duped flags
 2025-08-26 01:48:31 +00:00
Burzah
fb9037b823 Moves alert messages to tgui in admin_verb.dm (#29998) 
* initial commit

* Fixes whitespace around list elements

* fixes some more oops
 2025-08-26 01:46:39 +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
1080pCat
11af4a9ea5 Update tendril_loot.dm (#30276) 2025-08-26 00:50:30 +00:00
Chap
bc5b2d61d6 Add imaginary books to the library blacklist (#30269) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2025-08-25 17:53:53 +00:00
PollardTheDragon
c6e164a643 Basic gutlunch and goldgrub (#30032) 
* Goldgrubs

* Gutlunches, breeding code, goldgrub fixes

* Lints

* Extra define

* Config screwup

* Linters again

* Oops

* Gets rid of extra kangaroo

* Formatting and grammar

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

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-08-25 17:52:42 +00:00
Kyani
e6e5f5ce36 Xenobiology QOL tweaks (#30062) 
* Xenobiology QOL tweaks

* fixes

* Update generic.dm

* name tweak

* Update code/__HELPERS/trait_helpers.dm

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

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-08-25 17:51:27 +00:00
PollardTheDragon
3d56e28b58 Adds EPS-99 Pulse Shield Generator for mechs (#30043) 
* EPS-99 Pulse Shield Generator

* Increased drain

* Increased energy drain more

* Uses the cool AT shield. Thanks colossus. And lints

* Fixes and oversight coverage

* Messages when shield is disabled.

* Fixes + shield alpha

* Shield sprites
 2025-08-24 15:16:26 +00:00
PollardTheDragon
9044084b95 Gives all Heads of Staff energy pistols, equips with cybernetics (#29848) 
* Gives all heads of staff epistols, starts with basic implants

* Whoops

* Replaces roundstart head of staff implants with them being in single-use autosurgeons

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-08-24 15:12:55 +00:00
Osetrokarasek
7232c75561 bgfbfg (#30117) 2025-08-24 03:35:17 +00:00
CRUNCH
23f781c849 Makes Malf/Emagged/Flayer'd Borgs Into Mindslave Subtypes (#30054) 
* Creation

* malf

* Update robot_mob.dm

* Apply suggestions from code review

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: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-08-24 03:33:28 +00:00
Silverplate
dab79a45d4 Xenos cant roll under 50 crew (#30041) 
* Xenos cant roll under 50 crew

* Timing define

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

---------

Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-08-24 03:32:54 +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
Silverplate
bf750135d0 CSI Eridani: Detective content update (#27512) 
* Ports Bay/ss220 detective work

* Removs detective scanner from circulation

* forensic supply crate

* Ports Bay/ss220 detective work

* Removs detective scanner from circulation

* forensic supply crate

* Mapping changes

* Mapping changes

* Ports Bay/ss220 detective work

* Removs detective scanner from circulation

* makes linters work

* i hate vscode

* fixes some nonsence

* may fix CI

* restore maps to CURRENT

* QOL

* makes gunshot residue actually work.

* fixes cursed logic

* adds scene cards again

* scene cards but real!

* fix med records, breaks attack chain

* Revives the PR

* fixes swabs

* TGUI update

* lewc and dgl first reviews

* dna medical records

* LINTERS FIX

* linter fix 2

* blood fix and linters again

* oops

* updated but broke

* help

* Chuga suggestion

* Fix shoes ending up with a null blood_DNA entry

* replace astype() because linters are still in the stone age

* 2 fixes, adds fingerprint cards to HOP locker.

* check user intent instead of target intent when swabbing

* adds 2 boxes of swabs to the det drobe

* comma important

* adds new det tools to sec belt

* Chuga review

* fuckin github

* should fix TM

* oops

* how about now

* also fixes cere

* fixes mobvars

* Update code/modules/detective_work/swabs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* Update code/game/objects/effects/decals/cleanable.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* Lewc review easy changes

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* Updated related bugfixes

* add swab to lathe

* fix metastation

* Fixes scene_cards

* fix cerestation

* fixes forensic kits

* Changes and fixes forensic_machines

* changes /obj/item/sample to use initialize

* spaces

* fix initialize to use a capital I

* mapload

* fixes linters probably

* meta fix

* swab fix maybe

* oops

* actual fix probably

* ma ybe

* bundle rebuild

* fixes fingerprint cards

* remove duplicate proc call

* /obj/item/sample migration

* /obj/item/forensics migration

* microscope and dnaforensics machines migrated

* I FORGOT DA VARS

* linter fix

* linter fix 2

* Funny review part 1

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* bundle update

* contra/funny review

* fixes CI probably

* CI fix

* cere mapping fix yipee

* screwdriver panel fixes

* improve forensic machine interactions

* improve open panel msg

* pollard review

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* linter fix

* Apply suggestions from pope review

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* rebuild

* rebuild

* Detective Rework

---------

Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Chuga <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: Toastical <20125180+Toastical@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
 2025-08-23 15:27:38 +00:00
Toastical
d01d464170 enables skin.dmf profiler verbs if people have the needed perms (#30148) 2025-08-22 15:55:02 +00:00
Toastical
f2802df318 re-adds eating cooldown (#30193) 2025-08-22 15:34:10 +00:00
PollardTheDragon
0ae73635e2 Adds some generic AI controllers (#30061) 
* Generic controllers

* Linters
 2025-08-22 15:33:14 +00:00
PollardTheDragon
6d5fc55299 Shuts up mobs that aren't near anyone (#30186) 
* Shuts up mobs that aren't near anyone

* Hivebots too
 2025-08-22 15:23:16 +00:00
PollardTheDragon
edeea0af27 Fixes electrocution effect (#30204) 
* Fixes electrocution effect

* Purges spare effect
 2025-08-22 15:19:49 +00:00
PollardTheDragon
4bed17ef31 Adds new trader shuttles for each trader type (#29734) 
* Prepare for trade shuttles

* The ships

* Debug logs

* W i d e

* Adjust

* Update boxstation.dmm

* Templates instead of landmarks, test this

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Fixes

* Removed unnecessary comment

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Null check

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Reorganizes some ships to make viewing easier

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
 2025-08-22 15:10:41 +00:00
PollardTheDragon
68171a0442 Makes basic mobs work with lazarus injectors (#30134) 
* Makes basic mobs work with lazarus injectors

* Update code/modules/mining/equipment/lazarus_injector.dm

Co-authored-by: Burzah <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: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-08-22 15:01:44 +00:00
Contrabang
dd6eeec8b2 Moves cameras to the new attack chain (#30168) 
* Moves cameras to the new attack chain

* better
 2025-08-22 14:57:37 +00:00
Qwertytoforty
9fe2564b4d add blackboxing to organ installation (#30107) 2025-08-22 14:42:43 +00:00
Toastical
b319767611 fix picking up plants with bags (#30184) 2025-08-21 20:22:55 +00:00
Qwertytoforty
f419ada1e0 Updates the whiteship paper to a lore console (#30059) 2025-08-21 20:02:52 +00:00
azulez
256e07a6fc Prevent observer jumps from showing up in dchat (#30211) 2025-08-21 18:47:50 +00:00
Burzah
191131fb60 Changes a description of a mushroom (#30191) 
* edit

* dorf

* dorf2
 2025-08-20 14:40:44 +00:00
iramoye
fd932d5aac no more pipis (#30162) 2025-08-20 14:25:03 +00:00
Charlie Nolan
886eb158db Mind fixes (#30179) 2025-08-19 20:49:02 +00:00