cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 15:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,843 Commits 26 Branches 2 Tags
200512cefbe994d9512872bf60be22a3926ca077
Commit Graph

11453 Commits

Author SHA1 Message Date
Osetrokarasek
200512cefb Makes Gym Equipment Buildable And Disassemblable (#29449) 
* ga

* k

* Update sheet_types.dm

* nailed it lol

* Update sheet_types.dm
 2025-06-19 17:41:26 +00:00
Toastical
42ebe301d7 migrated autopsy scanner + added print cooldown (#29565) 2025-06-18 20:57:01 +00:00
Osetrokarasek
8b3de4dd3e Add Wheelcart Sound To More Objs (#29427) 
* bo

* ba

---------

Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
 2025-06-18 20:31:24 +00:00
CRUNCH
086e77c46d The healing power of lead (#29426) 2025-06-18 20:25:24 +00:00
YoureNotTheSharpest
28939d655c Greys yearn for this PR, Replaces borg extinguishers with a Firefighting Foam variant. (#29327) 
* adds a cyborg FE that starts with FFF, and replaces the old extinuishers, except for the syndicate ones.

* allows syndicate medical borg to refill their extinguisher, whoops

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

grammar

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

* adds spaces to comments as requested

---------

Signed-off-by: YoureNotTheSharpest <107788621+YoureNotTheSharpest@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-06-17 16:54:31 +00:00
Osetrokarasek
6c2915e581 New Mining Wardrobe (#29515) 
* shoes resprites n fixes

* added under clothing sprites

* added softcaps and berets sprites

* added vendor sprite

* added missed shoes sprites lol

* coded it plus added dogfashion for baseball hat

* tweaked contents of the mining wardrobe closet

* added new vendor on all maps

* added new vendor to lavaland outpost too!

* added missing beret sprites for drasks

* added missing harshskirt sprites

* added missed pads for racial exploring suits

* Update code/modules/clothing/under/jobs/cargo.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

* Update wardrobe_vendors.dm

* recoloring

* updated desc

* Update code/datums/dog_fashion.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>

---------

Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-06-17 16:47:55 +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
CRUNCH
60173b3566 Printable woo! (#29428) 
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
 2025-06-11 17:15:41 +00:00
warriorstar-orion
0adc3913d1 prohibit prefabs in spawner loot lists (#29556) 
* prohibit prefabs in spawner loot lists

* fix copy paste
 2025-06-11 17:12:47 +00:00
warriorstar-orion
2acf4a628c make space goliaths, hivelords, and basilisks spacewalk (#29442) 2025-06-11 17:04:30 +00:00
PollardTheDragon
e5a08230ee Inspector - IAA Stare, Alt-Title, and a Station Report (#29487) 
* Inspector alt title and gaze

* Clipboard

* Apply suggestions from code review

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

* Reduces duplicate code

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-06-11 17:03:17 +00:00
Kyani
fdcf4899a2 Frankenstein Station 13: Introducing dissections and alien organs to xenobiology (#29093) 
* ddsadsa

ddsadsa

* moderate again

* revert

* beginning with rebase

* organssssssssss

* organs now process!

* analyzer finished! + mapping

* tool bit implementation and quality

* organs and fixes and reworks

* more organ work

* more organs done

* more organ progress!

* more organ work

* MORE. ORGANS.

* temp

* more organsssss

* ITS DONE!!!!!!!!

* oops

* also oops

* linter stuff

* forgot this + oops

* linter

* i forgot to save!

* lots of improvements and tweaks

* move icon over

* icon tweaks

* icon mistake

* oops

* dumb

* more icon validations

* i think thisll fix it?

* Apply suggestions from code review

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

* fixes

* fixes+tweaks

* fix

* oops

* linter

* i didnt save....

* this should give -some- warning

* forgot a span

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* beginning edits

* more fixed and tweaks with cooldowns

* Apply suggestions from code review

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

* lots of tweaks

* more review changes

* comment change

* Apply suggestions from code review

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

* returns start back to gland

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* code review fixes

* trying to make surgery work....

* might as well push this

* perfection. now i need text

* text + small tweaks and bugfixing

* linting

* forgot to implement this

* deconflicting maps

* modifying for xenos again

* i guess this wasnt needed???

* added surgical belts to xeno

* minor swap

* quick fix

* small tweaks

* small tweak

* tiny tweak

* some slime updates

* more tweaks

* more updates

* first batch of fixes

* hiero audio fix

* robotic fauna fixes

* more rounds of bugfixes

* prevents teleporting

* tiny fix

* makes sharp more common

* misc fixes

* surgery and revenant fixes + extractor

* adds cursed organ logging

* small bananium organ tweak

* actually gives teleporter access

* adds a message to the analyzer

* can now drag naughts

* slime behavior tweaks

* headslug tweak, cant eat organs

* Update code/datums/components/special_tastes.dm

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

* Update code/datums/components/special_tastes.dm

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

* Update code/datums/components/special_tastes.dm

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

* Update code/modules/mob/living/simple_animal/slime/slime_mob.dm

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

* Update code/modules/mob/living/simple_animal/slime/slime_mob.dm

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

* Update code/game/gamemodes/miniantags/revenant/revenant.dm

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

* Update code/datums/components/special_tastes.dm

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

* Update code/game/gamemodes/miniantags/abduction/gland.dm

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

* Update code/game/gamemodes/miniantags/abduction/gland.dm

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

* moved this

* major rework prep

* didnt save

* rework done

* small fix

* makes aliens draggable by crew after death

* shouldnt have cut this

* xeno organ tweak + tips

* oops

* fixes and tweaks to slimes

* not used

* temp revert

* rebase map files to master

* re-applying changes

* access fix

* access tweak

* big fix for new refactor

* more refactoring

* forgot a span

* Update code/datums/components/surgery_initiator.dm

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

* hiero only doesnt target dead megafauna

* various fixes

* fix requests

* fixed weird conflict markers

* deconflict

* deconflicting

* antimagic flags

* merge fixing

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

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

* regen mesh fix

* small fixes

* tick fix

* Apply suggestions from code review

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

* grammar

* Update code/modules/surgery/organs/organ_internal.dm

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

* Update code/modules/surgery/organs/organ_internal.dm

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

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

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

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

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

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

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

* tweaks

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-06-10 16:46:56 +00:00
Osetrokarasek
8dcfbb327e No Brute From Throwing Cig Butts (#29445) 
* fo

* fa

* Update lighters.dm
 2025-06-07 13:26:48 +00:00
Contrabang
f9e95a2b1d Adds an icon for non-abstract nodrop items (#29452) 2025-06-07 13:25:01 +00:00
Osetrokarasek
3b25e662a2 Update cash.dm (#29523) 2025-06-07 13:17:06 +00:00
CRUNCH
df362db8af Gives Medical Cyborgs a Holo Stretcher Upgrade (#29352) 
* creation

* Update code/game/objects/items/robot/robot_upgrades.dm

Signed-off-by: Burzah <116982774+Burzah@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-06-04 13:15:57 +00:00
kyunkyunkyun
f07620aeb3 Get rid of generic office chair type (#29156) 
* remove generic chairtype from maps

* rename

* refactor

* Update sheet_types.dm
 2025-06-03 18:16:14 +00:00
PopeDaveThe3th
5837434099 Adds Federation marine combat armor (#29285) 
* finally

* grey
 2025-05-30 21:13:03 +00:00
Stone
ccde8980d4 modified: code/game/objects/items/weapons/melee/melee_misc.dm (#29365) 2025-05-27 20:53:18 +00:00
kyunkyunkyun
2bc70f523c Sorta revert of #29402 (#29436) 
* Revert "Remove useless fillers for multitile doors (#29402)"

This reverts commit e351e69ad5.

* keep em

* now we are safe
 2025-05-25 16:49:37 +00:00
warriorstar-orion
43fe113250 rename some mapping-related files (#29422) 2025-05-25 16:45:52 +00:00
warriorstar-orion
e690c3b916 tweak casino mobs and loot (#29389) 2025-05-25 15:50:03 +00:00
kyunkyunkyun
e351e69ad5 Remove useless fillers for multitile doors (#29402) 
* fix

* OH so that was the issue

* ...
 2025-05-25 15:45:48 +00:00
Osetrokarasek
07230191d7 Update bags.dm (#29248) 2025-05-22 18:59:56 +00:00
Qwertytoforty
9329d265ab Adds 2 new ruins, a space and lavaland relay (#29335) 
* Adds a space and lavaland ruin

* random shelves

* oops

* and this one

* desc update
 2025-05-22 14:08:42 +00:00
Qwertytoforty
bb94eae308 Grants the white ship submaps (#29140) 
* you will get a robotics bay and you will like it

* also nanopaste

* work

* and kill those whoops

* holy fuck how many times did I missclick

* stop fucking unticking shit please fuck

* colour coding

* fix floor

---------

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-05-22 00:09:18 +00:00
chuga-git
d91c93ece6 fixes runtime when building stack recipes (#29392) 2025-05-21 23:17:21 +00:00
warriorstar-orion
a00e2ea220 fix inability to climb over railings (#29383) 2025-05-21 15:09:51 +00:00
warriorstar-orion
45e88ffb71 refactor is_blocked_turf (#29324) 2025-05-21 00:43:45 +00:00
warriorstar-orion
7faed06981 Adds dynamic airlocks, a flexible mapping tool (#28852) 
* move airlock controller defines to the right place

* goddamnit

* Adds dynamic airlocks, a flexible mapping tool

* Apply suggestions from code review

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

* final as anythings

* break some long comment lines

* rebuild rust just in case

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-05-19 21:40:52 +00:00
warriorstar-orion
1ace49ec1a Golem ship remap and equipment tweaking. (#29294) 2025-05-17 13:18:47 +00:00
Christasmurf
de2e87289b CMO & RD Drip (#29333) 
* code code code

* all of the sprites

* final code?
 2025-05-17 13:11:42 +00:00
ExusA
e81fbe2d18 new satchels (#29302) 2025-05-15 08:26:02 +00:00
Toastical
2e0d3dbf29 replace abstract flag with skip_examine trait (#29276) 2025-05-13 22:26:27 +00:00
warriorstar-orion
04f5a04f32 switch spawn pools from using IDs to typerefs (#29227) 2025-05-13 21:51:35 +00:00
warriorstar-orion
dfacf83e18 Ports deer to basic mobs and adds some behaviors (#29270) 
* ports deer to basic mobs and adds some behaviors

* update updatepaths script number

* whitespace

* Apply suggestions from code review

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

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-05-13 06:23:30 +00:00
PollardTheDragon
9cabc380b4 Makes Golems Mine Again (#29154) 2025-05-13 06:13:25 +00:00
Inferno1882
a4f701aad2 Update watercloset.dm (#29172) 
Small tweaks

Signed-off-by: Inferno1882 <129122173+Inferno1882@users.noreply.github.com>
 2025-05-13 04:41:40 +00:00
Osetrokarasek
9f6ff3a204 Fire-safety and Emergency Closets' Contents Tweak (#29223) 
* bleh

+ added crowbars into fireclosets
+ wall emergency locker's contents now match the contents of the common one

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

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

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

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

---------

Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-05-13 04:07:48 +00:00
Toastical
d3e09bcb76 increase slots to 27 (#29243) 2025-05-13 04:06:38 +00:00
warriorstar-orion
cca96c5e15 restrict food tray pickup items to food, fix sliceable tray click pickup (#29216) 2025-05-13 04:02:24 +00:00
BiancaWilkson
2815be652e Ports pneumatic cannon to new attack chain (#29287) 
* Ports pneumatic cannon to new attack chain

* adds interact_with_atom too
 2025-05-13 03:53:29 +00:00
kyunkyunkyun
8d92950a77 Custom patch icons for ChemMaster (#29206) 
* custom patches

* item state ruins context menu's sprite
 2025-05-10 20:45:43 +00:00
YoureNotTheSharpest
b4bdb66029 Adds Firefighting Foam extinguishers, this time hopefully wont be accidentally closing (#28791) 
* Adds an atmospherics specific fire extinguisher that sprays firefighting foam!
Adds a firefighting foam tank to all the maps that refils the fire extinguisher added!

* allowed fff to enter regular extinguishers

* changed the FFF to have an F on it rather than an image of smoke

* should fix the conflicting object.dmi issues

* adds orderable firefighting foam tank crate

* makes farragus playable (literally)

* removes redundant if statement

* changes from max_water to reagent_capacity and reagent_id
 2025-05-10 20:16:47 +00:00
warriorstar-orion
58967ee12e elementize pet collars (#29209) 2025-05-07 22:31:17 +00:00
warriorstar-orion
d9f9c58e37 move random spawners readme to devdocs (#29214) 2025-05-07 22:23:30 +00:00
Toastical
c9d96322c4 Adds a megafauna_safe_range var to ruin datums and adds a megafauna exclusion zone to ghost spawn ruins on lavaland. (#29120) 
* add exclusion check, change area types, update script

* merged the 2 for loops

* removed commented out section

* rename updatepaths script

* var

* undo area and map edits

* add safe var for ruin datums, add megafauna distance check for safe ruins

* removed unneeded file

* rename variable
 2025-05-07 02:09:41 +00:00
Christasmurf
dde810d7bf all the bits (#29130) 2025-05-04 03:46:44 +00:00
kyunkyunkyun
7aaca16579 Update firstaid.dm (#29088) 2025-05-04 03:40:11 +00:00
kyunkyunkyun
ec6a23eec5 Make multitile airlocks/poddoors directional (#28928) 
* Update multitile airlocks

* Update shuttle_rotate.dm

* updatepaths

* code review changes + linters

* i failed my own linters

* updatepaths
 2025-05-04 02:35:33 +00:00