cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-14 19:41:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,037 Commits 27 Branches 2 Tags
4acbbc1e525979eb649ba48c83f5700bbbd074ef
Commit Graph

703 Commits

Author SHA1 Message Date
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
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
Toastical
6a9453f367 add poisoned apples as an apple mutation (#31115) 2025-12-03 20:21:35 +00:00
Alan
b967268c90 Prevent base type citrus in chef fridge. (#31170) 
* Prevent base type citrus in chef fridge.

* ... And make sure limes pass linters.
 2025-12-02 18:57:40 +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
Toastical
a1fc8db55f standardize temperature_expose args (#30903) 
* standardize temperature_expose args

* some i missed

* remove dubious use of temperature_expose()

* fix hardsuit tank insertion proc

* remove unused gas_mixture arg

* revert test_tiny.dmm
 2025-12-01 18:58:38 +00:00
DGamerL
d518b81ada Why does Kudzu do this (#31163) 2025-12-01 13:39:37 +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
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
Christer2222
d6988db52a Adds a 'low details' mode to plant analyzers (#30793) 
* adds low details mode to plant analyzer

* added water and nutrition to low details

* lint

* grammar

* autodoc
 2025-11-07 16:59:55 +00:00
Toastical
a34d76ba32 migrates /obj/item/grown to the new attack chain (#30811) 2025-11-06 07:07:07 +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
Toastical
4a40072c22 fix new calls for hydroponic shit (#30730) 2025-10-21 19:00:39 +00:00
Toastical
7816bb8e57 move hydroponics to use Initialize() (#30598) 2025-10-17 18:18:04 +00:00
CRUNCH
c4a0341c1a Update tobacco.dm (#30504) 2025-10-03 00:46:24 +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
PollardTheDragon
1e9adf9d7b Converts Trees and Panthers to basic mobs (#29992) 
* Converts trees and panthers to basic mobs

* Oops

* Another oops

* Whoops

* Update paradise.dme

* CI fix

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-09-19 14:21:01 +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
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
CRUNCH
881a0da37b Update mushrooms.dm (#30223) 2025-09-02 14:44:55 +00:00
PollardTheDragon
f0ddf0a4ba Nerfs Poultices (#30110) 2025-09-02 05:48:06 +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
6bf1906823 Fixes potatoes not becoming potato batteries (#30251) 
* Update potato.dm

* e
 2025-08-27 20:06:27 +00:00
Toastical
b319767611 fix picking up plants with bags (#30184) 2025-08-21 20:22:55 +00:00
Burzah
191131fb60 Changes a description of a mushroom (#30191) 
* edit

* dorf

* dorf2
 2025-08-20 14:40:44 +00:00
CRUNCH
dc629eb29e Migrates obj/item/food to the new Attack Chain (#29860) 
* Creation

* Update food_base.dm

* FUCKING IF SPACE

* plants

* more plant

* Update tomato.dm

* Update root.dm
 2025-08-19 06:53:49 +00:00
PollardTheDragon
8976c80adc Converts giant spiders to basic mobs (#29796) 
* Giant spiders initial

* Ling spiders, araneous, conversion to basic

* Removed some extra

* Fixes cling spiders

* Linters

* Do_afters

* Nurse AI works now

* Cling spider AI

* Forgot an element

* Updatepaths

* New Linters

* AI New linters

* Fixed action buttons

* No longer wraps spiderlings, adds a movement delay

* Fixes the sarge hatching from eggs, increases action cooldown on eggs

* Improved cling spider AI, improved insect random speech

---------

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-07-31 06:08:18 +00:00
PollardTheDragon
97d72d6e22 Converts Feral Cats, Killer Tomatos, and Non-Demon Creatures to Basic Mobs (#29785) 
* Converts Feral Cats, Killer Tomatos, and Non-Demon Creatures to Basic Mobs

* Updatepaths

* Adds ventcrawling target finding behavior.

* returnPipenet()

* Apply suggestions from code review

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

* New Linters

* Fixed DME

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2025-07-31 06:00:51 +00:00
Contrabang
1504ed98be massive burndown (#29894) 2025-07-27 20:52:39 +00:00
Kyani
586e2e6c4d Job Perks - True Professionals (#29478) 
* ddsadsa

ddsadsa

* moderate again

* revert

* medical first steps

* more work

* lots more work done

* more progress

* finished up

* attack chain linter

* attack chain update

* attack chain work

* fixes + chemist update

* gives comments
 2025-06-13 19:40:29 +00:00
Toastical
0a6745cd82 allow sentient bees to leave and enter hive + fix queen bee home (#29580) 2025-06-11 18:03:09 +00:00
AmityBlamity
52f5ab0efc Standardized plant names (#29455) 
* 🆑 AmityBlamity
fix: Changed ambrosia_gaia to ambrosiagaia to standardize with other plant names
/🆑

* Update code/modules/hydroponics/grown/ambrosia.dm

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

---------

Signed-off-by: AmityBlamity <142629851+AmityBlamity@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-06-03 21:24:41 +00:00
YoureNotTheSharpest
50ebfe143a removes sterilizine and replace all mentions with spaceacilin (#29124) 2025-05-30 20:49:00 +00:00
Migratingcocofruit
d81fc04f10 Update beebox.dm (#28936) 2025-04-15 14:29:39 +00:00
warriorstar-orion
07a22cdb64 Enable multi-sector lavaland. (#28358) 
* Enable multi-sector lavaland.

* fix exclude ci paths

* remove old lavaland

* Lewc review and other cleanups, add GPS stuff

* rebuild tgui

* fix ash storm no eligible areas

* update test config, don't skip out on test level creation

* unfuck example config

* whoops

* add north entrances to legion arena for easier traversal

* TM config -- REVERT BEFORE MERGE

* Make SSweather work on traits directly

* flip order of procgen/ruin placement

* fix GPS

* fix budget in code

* clobber prod config for lavaland ruin budget for TM

* add relay to gulag

* some more guards for procgen

* separate relays

* make gulag and base one ruin

* bridge improvements

* actually remove gulag map

* make linter happy

* harden ruin placement against failing

Config changes made. Bypassing code ownership.
 2025-04-08 06:18:46 -07:00
Contrabang
fde22d1c43 Adds more reasons to explosion logging (#28812) 
* explos

* yeah good enough

* shorten that

* use ckey

* forgot this cause

* unfuck it
 2025-03-28 18:49:57 +00:00
Migratingcocofruit
5916458d2d Atomic Gardening (#28657) 
* adds rad_act to hydro trays

* small adjustments
 2025-03-25 10:21:18 +00:00
ExusA
a1ff715bf1 Adds a bunch of buildable wood stuff, resprites planks (#28528) 
* New wooden furniture

* Bonfire repath

* Wood retexture

* Wood Resprite

* Fixes

* Description fix

* Fixes

* Undo match changes

* Undo match icon changes

* Typepath script

* rackable spears

* bounding box adjustment

* Spear Rack

* Memorial tweaks

* Apply suggestions from code review

Co-authored-by: Toastical <vnndvp@gmail.com>
Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>

* More memorial tweaks

---------

Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>
Co-authored-by: Toastical <toastical@toaster.com>
Co-authored-by: Toastical <vnndvp@gmail.com>
 2025-03-16 18:02:40 +00:00
cool20141
7d65d1d99b fixing improper message for biogenerator interaction (#28522) 
Co-authored-by: cool20141 <>
 2025-02-26 09:51:03 +00:00
chuga-git
570b45a903 refactors some item transfers to use transfer_item_to() (#28405) 2025-02-18 10:38:09 +00:00
PopeDaveThe3th
81db52aaf4 [LORE] Fixes the cannabis leaf's description (#28313) 
* wed

* Update cannabis.dm
 2025-02-13 02:21:37 +00:00
ImOnMinimal
79db47edc6 Update flowers.dm (#28353) 
Signed-off-by: ImOnMinimal <101551292+ImOnMinimal@users.noreply.github.com>
 2025-02-12 12:22:35 +00:00
Mira
d28d740216 Fix some cases of silicons teleporting items on put_in_hands (#28017) 
* fix some cases

* forceMove

* replace usr with user
 2025-01-28 21:03:31 +00:00
CRUNCH
e214704b34 Update hydroponics_tray.dm (#28119) 2025-01-26 06:31:00 +00:00
warriorstar-orion
f479ace54f Attack chain migration: /obj/machinery (#27784) 
* one at a time let's go

* air alarm

* so many

* meh

* hell

* hell

* hmm

* Attack chain migration: /obj/machinery

* what the fuck?

* hell

* review fixes

* whoops

* fix build

* nuke fixes, more tests

* gland dispsenser and start of autolathe test

* var renames

* small fixes

* i tire of life

* more tests

* more tests

* more tests

* shrink map

* customize autolathe design disk load delay

* cell charger

* fire alarm frame installation test

* funny and burz reviews

* nuke fixes
 2025-01-26 00:23:42 +00:00
Drsmail
754a868650 [FIX] Better slices (#27807) 
* Slices have a base class /food/slice

* Refactor

* Small fix

* Adds default reagent for empy slices

* Looks good

* adds_list_reagents

* "Reverted snake_case_remap files to state from original commit

* I don't know how to resolve merge conflicts :)

---------

Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
 2025-01-25 19:36:04 +00:00
ExusA
d724ced7b2 Resprites Disks (#27804) 
* Resprites disks

Resprites all normal disks, excluding the holodisk used by megafauna hardmode and DVORAK.

* Add feedback for other disk types

* Disks come in more colors

* Restored old nuke disk screen
 2025-01-10 02:15:48 +00:00
warriorstar-orion
0eafad8475 Refactor /mob/unEquip. (#27720) 
* Refactor /mob/unEquip.

* fix things found in testing

* more fixes from testing

* fix removal of hooded suits

* fix flayers inability to deploy swarmprod

* fix changeling blade activation

* unnecessary parens

* pass default unequip args to proc overrides

* fix belts being able to forceMove into full hands
 2025-01-10 01:58:35 +00:00