cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-30 11:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,993 Commits 30 Branches 2 Tags
ee228cdb6b02a87bc6c0b58652e56ceca2cb019b
Commit Graph

4888 Commits

Author SHA1 Message Date
CRUNCH
ee228cdb6b Migrates restraints to the New Attack Chain (#31310) 
* e

* Update legcuffs.dm

* Update umbrae_powers.dm

* Update code/game/objects/items/weapons/legcuffs.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-12-26 10:50:42 +00:00
CRUNCH
eeb980f191 Adds Reycleable Materials to a Bunch of Objects (#31320) 
* recycle

* moar

* Update glass_containers.dm

* Update spray.dm

* cost adjustment because sheets are 2000, not 1000

* Update hydroitemdefines.dm

* Update hydroitemdefines.dm
 2025-12-25 21:03:22 +00:00
Christer2222
33dff2756e Adds a description to C4 and X4 showing you can set a timer (#31308) 
* description

* new description
 2025-12-25 21:00:41 +00:00
CRUNCH
d360ca18cc Fixes Chemthrower Fire Burning Mobs That Don't Care About Fire (#31316) 
* fire

* Update fire_effect.dm
 2025-12-19 13:10:59 +00:00
warriorstar-orion
481f035722 Metastation kitchen area redesign and related features, take 2 (#30754) 
* Metastation kitchen area redesign and related features, take 2

* reviews
 2025-12-18 23:46:17 +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
Hayden Redacted
5728e0c46f Adds Water Vapor and the Electrolyzer (#30875) 
* this will work first try (adds water vapor and the electrolyzer)

* naming fix

* removes a warn

* makes water vapor able to be seen and adds it to the tiny_test atmos map

* Build Rust library

* adds the electrolyzer to all maps, and linter fix

* linter fix part 2

* electrolyzer tweak and more work on the test_atmos map

* tgui rebuilding

* re
rebuilding tgui

* makes the electrolyzer consume power and some small test atmos touch ups

* im axing the test_tiny because i don't want to map it

* clarifies how much power the electrolyzer uses

* Build Rust library

* suggestionss

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* updating the SM manual

* electrolyzer tweaks

* dg suggestions pt. 2

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* removed unused code

---------

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
 2025-12-10 00:04:11 +00:00
DGamerL
ead98c299a Fixes a bunch of bugs with chemical flamethrower canisters (#31177) 
* Finally got around to this

* Killing the linters

* Apply suggestions from code review

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-09 02:50:17 +00:00
PollardTheDragon
9248c028b1 [PTBF] Example PR: Kill Station Pet (#30650) 
* Pet Assassination

* Antag rolls

* Adjusts weights to equal 1000

* Map deconflict

* Linter

* Update code/game/gamemodes/objective.dm

Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-05 22:16:33 +00:00
Ahzpy
f36344740c Adds Blind Cane (#31136) 
* blind cane

* fix equal sign spacing

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-12-04 15:59:23 +00:00
Alan
c7ac9f1037 Add soft drinks to bar secondary goals. (#31100) 
* Add soft drinks to bar secondary goals.

* Thanks, linters!

* Update bar manual to reflect that procurement will accept soft drinks.

* Add drink difficulties to synthetic soft drinks.
Amend bar manual.

* Thanks, linters!
 2025-12-03 18:31:30 +00:00
Alan
101af16180 Adjust monitor headwear, featuring cowboy hats. (#31066) 2025-12-03 16:58:02 +00:00
funglios8s
6a6f81131e Adds Tapioca and Cassava plants (#30937) 
* dat

* Fixes a few issues and makes the pudding look good

* fixes all sprites with hope

* actually should fix the sprites

* fixes cassava sprites and dough recipe oversight

* fixes tabbing issues and prevents botany gaming

* makes the linter happier + deletes duplicate file

* changes many things about the order

* generalizes the food reagentcontainer + linter gud

* fixes the merge conflict

* removes the settings on my vs code from my pr

Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com>

* Adds suggested changes

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

* adds an abstract description

* fixes an accidental deletion of vscodesettings

* Update code/modules/reagents/reagent_containers/food.dm

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

* adds a missing typepath

* Apply suggestions from code review

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

* Propose 2 tapioca pudding sprites.

* removes unused tapioca pudding sprite

* fixes my paradise.dme file

* Add new teas to the bar manual.

* adds alfalfa scout's recommended mix message

* attempts a fix for the .dme file

* removes a deconflicter mistake

* Apply suggestions from code review

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

---------

Signed-off-by: funglios8s <167113955+funglios8s@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
 2025-12-01 19:12:50 +00:00
CRUNCH
425d9313fa Update kitchen.dm (#31073) 
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
 2025-11-30 09:48:40 +00:00
Christer2222
d4a435f740 You can now color boxes using crayons (#30977) 
* Americanized spelling

* more spelling

* spelling + alt click

* recoloring box, put it in hand and in bag

* in backpack now

* remove old comments

* updates inventory if backpack is open

* place in bags even on floor

* null check + checks actual type

* added the color tables

* added empty subtypes. Fixed movign away bug

* lint

* mapload + as mob removal

* early returning

* removed type checks. Added more checks for coloring

* added a description + early return on color tables

* lint

* documentation, formatting, HAS_TRAIT

* formatting
 2025-11-28 03:51:46 +00:00
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
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
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
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
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
iramoye
9f1a329238 initial commit (#30887) 2025-11-11 10:30:36 +00:00
Qwertytoforty
746de75bdd Adds most shotgun ammo boxes to cargo. Allows them to be crafted. (#30837) 
* pope why didn't you test it haughughuugughuhguhguhgh

* ok let us be real it doesn't need 50 more what was I thinking

* oop

* a static shock

* spelling

* Update code/game/objects/items/weapons/storage/boxes.dm

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

* so full of order of operations yum

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-11-08 22:11:53 +00:00
SPACEGEESE
bee4f00416 changes surgery_initiator to /robo/sharp (#30873) 
/robo to /robo/sharp, should fix bug while retaining silicon effectiveness in wiki

Signed-off-by: SPACEGEESE <136994596+spacegeese@users.noreply.github.com>
 2025-11-07 16:29:28 +00:00
Alan
47300bb0d0 Expand chef ensemble possibilities (#30826) 
* Add many chef clothes to game, chefdrobe, and loadout.

* Add another chef envirosuit.
 2025-11-05 10:22:00 +00:00
PollardTheDragon
ae4489cb2f Converts bees to basic mobs (#30662) 
* Converts bees to basic mobs

* Undefs

* Linters
 2025-10-28 20:53:18 +00:00
Qwertytoforty
2ecff9033a [PTBF] [ready for review] Anomalous particulate processing objective. (#30649) 
* pausing work on this till pickweight

* push

* more stuff

* proper file it

* these 2 would be interested

* and examine fix

* I should be more awake before resolving merge conflicts

* god you are stupid stop commiting every 2 seconds

* temp buff size change

* Event inhand descriptions

* behold the c o d e

* the rest of the owl

* sprite correction

* 2 more words to the list

* and this one

* yes I am having too much fun with this

* m o r e

* better glow, tech levels

* Apply suggestions from code review

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

* message admins, variable

* Apply suggestions from code review

Co-authored-by: Taurtura <141481662+Taurtura@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* PPPProcessor

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Taurtura <141481662+Taurtura@users.noreply.github.com>
 2025-10-25 01:01:03 +00:00
Alan
d55e4552c5 Fix the Captain's saber being invisible and undrawable in the eyes of others. (#30749) 2025-10-23 10:10:02 +00:00
PollardTheDragon
3e149e8e6b Improved Ashwalker Armory: Bone Equipment (#30600) 
* Adds Bone Sword, Bone Shield, Bone Sword Sheath. Todo: Light Bone Armor, Sword Inhand fix

* sword inhands

* Adds Light Bone Armor

* Linters

* Species sprites

* Fixes my crap grammar

* Updates belt icon sprite
 2025-10-19 19:06:58 +00:00
PollardTheDragon
fbd8930ff4 Securiblade Redux (#30488) 
* Securiblade Redux

* It's back

* Vars

* LINTERS

* Apply AP on burn damage

* Fixes recharger bug

* Slapper, Better code, cleanup, no damage on help intent while off or stun, sounds

* Secblade now makes a sound when turning itself off
 2025-10-17 17:00:50 +00:00
Alan
b2e0a08d0b Add a LOT of chaplain clothes from various religions. (#30483) 
* Add a LOT of chaplain clothes from various religions.

* Thanks, linter!

* Deploy vendors, box envirosuits, unaccent names

* Thanks, linters!

* Accommodate ears.

* Correct accent oversight.

* Merge branch 'master' into chaplain-outfits

Conflicts in
icons/mob/clothing/species/plasmaman/helmet.dmi
icons/obj/clothing/species/plasmaman/hats.dmi
resolved by automatic merge and modifying chaplain helmet sprites to match new format.
 2025-10-13 15:16:33 +00:00
kyunkyunkyun
9b095a559d Remove (almost) unused var/item_color from /obj/item (#30453) 
* it's black and white

* Update soft_caps.dm

* bruh

* bruh

* tweaks

* comment

* Update abduction_gear.dm

* Update paradise.dme

* Update paradise.dme

* Update paradise.dme

---------

Co-authored-by: Mason <116982774+Burzah@users.noreply.github.com>
 2025-10-06 17:59:46 +00:00
PollardTheDragon
37bcc87b39 Expanded productivity bit usage (#30476) 2025-10-01 14:49:32 +00:00
PollardTheDragon
e14a43eea1 Basic diona nymphs, spiderbots, and crabs (#30377) 
* Basic nymphs, spiderbots, and crabs

* Nutrition fix

* Forgot a line

* Cooldown on eat

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-10-01 14:32:00 +00:00
kyunkyunkyun
caa8343bf7 Repath some satchels (#30427) 
* fix satchel interactions

* updatepaths name
 2025-09-27 08:46:36 +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
iramoye
e3f373077e Initial commit (#30486) 2025-09-18 19:30:21 +00:00
PollardTheDragon
280ab5c19f Stops homerun bat from storing homerun charge after drop (#30478) 2025-09-18 06:00:34 +00:00
1080pCat
4ffa9870cd Migrates the baseball bat to the new attack chain, and makes it use tg cooldowns (#30387) 
* migrates the baseball bat to the new attack chain, and makes it use tg cooldowns

* meant to revert that

* moves a var

* Update weaponry.dm
 2025-09-14 19:52:30 +00:00
warriorstar-orion
3208049a8a Attack chain migration: structures. (#30365) 
* Attack chain migration: structures.

* whoops

* wth
 2025-09-14 19:21:36 +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
PollardTheDragon
0f438326b6 Converts Viscerators and Malfunctioning Combat Drones to Basic Mobs (#30080) 
* Initial Commit

* Targetting

* Linters

* Update code/modules/mob/living/basic/retaliate/combat_drone.dm

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

* CI fix

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-09-11 02:34:37 +00:00
kyunkyunkyun
10f2e67e65 Cleanups and tweaks observer code (#30250) 
* observer cleanup

* this

* bit more

* Update tgui.bundle.js
 2025-09-05 05:54:22 +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
7bdc36a032 Adds the syndicate equivalent of a mindshield, and other syndicate officer adjustments (#30311) 
* Adds the syndicate equivalent of a mindshield

* ci yay

* Update code/game/objects/items/weapons/bio_chips/bio_chip_fluff.dm

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

* Update code/game/objects/items/weapons/bio_chips/bio_chip_fluff.dm

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

* suspicion

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
 2025-09-04 07:09:56 +00:00
warriorstar-orion
7022365e53 add CI check for exploitable recycle costs (#30286) 2025-09-04 07:00:12 +00:00
kyunkyunkyun
ca8e5a6a7d nerf that water (#30209) 2025-09-02 05:53:52 +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
Osetrokarasek
90af6975e6 Fixing knifes material amount (#30323) 2025-08-29 15:19:17 +00:00
Chap
8b8181e18a Upgrade ERT oxygen tanks to doubles. (#30208) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2025-08-28 20:54:42 +00:00