cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 08:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,907 Commits 26 Branches 2 Tags
c7fe4e475b4563aff5f7115d324b2be29993cecd
Commit Graph

4809 Commits

Author SHA1 Message Date
Charlie Nolan
2e6b1fe6dc Add timeouts to several move_away calls (#29714) 
* Timeouts are important.

* Update code/game/objects/items/weapons/grenades/clusterbuster.dm

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

* Update code/game/objects/items/weapons/grenades/clusterbuster.dm

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

* Update code/modules/surgery/organs/organ_internal.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-07-05 05:46:10 +00:00
PopeDaveThe3th
f0c83f9803 Adds Stinger Grenades (#29178) 
* ballin

* sprite change

* curse of balance

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

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

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-07-04 19:13:08 +00:00
Toastical
9309ca46fb Adds storage dumping (#29641) 
* added storage dumping

* retain in storage item shuffling
 2025-07-04 19:07:07 +00:00
CRUNCH
71c98c3adf Weeeeeeed bro (#29485) 2025-06-19 17:43:35 +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
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
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
Osetrokarasek
07230191d7 Update bags.dm (#29248) 2025-05-22 18:59:56 +00:00
warriorstar-orion
45e88ffb71 refactor is_blocked_turf (#29324) 2025-05-21 00:43:45 +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
PollardTheDragon
9cabc380b4 Makes Golems Mine Again (#29154) 2025-05-13 06:13:25 +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
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
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
Toastical
1ca19b76b8 fix cigarette syringe injections (#29136) 2025-05-01 22:38:05 +00:00
Vi3trice
5b6513bfe0 Fix prayer bread runtiming on mindless mobs (#29164) 
* This bread isn't minding its business

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

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

---------

Signed-off-by: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-04-30 01:00:55 +00:00
warriorstar-orion
8797ca4602 remove cigarette debugging message (#29157) 2025-04-30 00:41:25 +00:00
CRUNCH
dc5f3a8365 Stamping out Cigarettes Doesn't Teleport Them to Your Mouth Anymore (#28993) 
* Update cigs.dm

* Update cigs.dm
 2025-04-26 18:26:40 +00:00
kyunkyunkyun
6f0f2b8024 Syndicate mobs rework (#28706) 
* initial

* i'll get fired

* update icons for mapping as well

* update maps

* tweak

* tweak and revert a bit

* tabs

* speak english, motherfucker

* oh

* updatepaths
 2025-04-26 17:58:24 +00:00
CRUNCH
00d32aed74 Migrates Smokables to the New Attack Chain (#28986) 
* Update cigs.dm

* Update cigs.dm

* yes

* Update test_tiny.dmm
 2025-04-26 17:51:45 +00:00
PollardTheDragon
6ecd1e4091 Tanks Matter: Refill Stations and Internals Nerfs (#28821) 
* Nerfs tank volumes

* Adjusted gas volumes, commented expected tank durations

* Refill station no id

* No more unwrenching refill stations

* Unary Refill Stations

* Refill stations are working, and sprited

* Analyzers and plasma tank limit

* added machines

* Made refill stations truly standalone, gave them canister-sized internal volumes. Removed excess file

* Fixed runtimes, emerald conflict

* implanted the machines

* placement revisions

* oops

* Fixes CI issues on Delta and Emerald

* Removed unintended change

* Grammar

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

* Power stuff

* Some map fixes

* More fixes

* Removes extraneous the, better checks for allowed tanks in plasma refill station

* Update for multi-sector lavaland

* Fixes air mix tanks distribution pressure

* Fixes runtimes

* Map merge fixes

* More fixes

* Even more map merge fixes

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: EmeraldCandy <silverriolu@yahoo.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-04-26 17:35:33 +00:00
CRUNCH
e6ad589b41 Update surgical_tray.dm (#28975) 2025-04-24 14:34:35 +00:00
kyunkyunkyun
94c0b75e63 fix (#29099) 2025-04-23 04:50:57 +00:00
PollardTheDragon
760db22912 Adds smith bag (#29015) 2025-04-20 21:07:41 +00:00
kyunkyunkyun
f9bf03271c Two handed component slight audio improvement (#28892) 
* Update two_handed.dm

* remove unused
 2025-04-18 19:28:41 +00:00
warriorstar-orion
fa1faf6054 add 'get machines by type' to SSmachines (#28979) 2025-04-16 17:17:54 +00:00
Custodi
1771ca456a Scanners display reagents inside of players' made bombs (#28607) 
* Set container_type to transparent & saving reagents adding to chem bomb

* Update code/game/objects/items/weapons/grenades/chem_grenade.dm

Add tab to line

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

---------

Signed-off-by: Custodi <31255302+Custodi@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-04-16 17:00:42 +00:00
Burzah
b5b05a11af Changes the colors of some chemicals while in glass containers (#28510) 
* Initial commit

* made color changes
 2025-04-16 13:30:57 +00:00
kyunkyunkyun
bf28bfd604 Updates Rocky Motel (#28786) 
* this motel rocks

* nvm i got chat gpt

* relocate icon

* oh it removed web commit
 2025-04-09 19:26:42 +00:00
warriorstar-orion
e5b7eb9559 Space ruin: The sieged lab, a submap extravaganza. (#28393) 
* Space ruin: The sieged lab, a submap extravaganza.

* fix airlock access

* fix skiff, make whole lab teleproof for now

* indestructible rivet command room

* add strategically placed helpful items/spawners

* fix gun rack placement

* no butchering on harbinger murder

* small adjustments

* esword drop as a treat, m90 seems excessive

* make boss door obvious

* Lots of map/boss fixes

* Update everything for razor wire, try and unfuck some weird AI behavior

* stupid mines

* sort and fix comments for different ruin categories

* always place ruin for TM

* first batch of fixes

* reinforce hard rock walls

* tweaks

* improve hard rock design

* tiny cleanups

* singleton out med and sci rooms

* kitchen rework updatepath

* run updatepaths

* update maplint exceptions
 2025-04-08 18:16:28 +00:00
CRUNCH
959d34f771 Syndicate Mobs With IDs Now Have Syndicate-Themed IDs. (#28640) 
* Syndie ID Drip

* Apply suggestions from code review

Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@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: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
 2025-04-06 09:44:20 +00:00
warriorstar-orion
c820499f90 Basic mobs core implementation and cow migration. (#28667) 
* Basic mobs core implementation and cow migration.

* fix whitespace

* uncomfortable fix for null weirdness

* update updatepaths script number

* lewc review 1

* fix delta

* Update code/datums/ai/basic_mobs/basic_ai_behaviors/tipped_reaction.dm

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

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-04-05 11:35:42 +00:00
kyunkyunkyun
093f5dbe1c Update energy_melee_weapons.dm (#28840) 2025-04-04 16:19:45 +00:00
kyunkyunkyun
5563f3ff19 3 weeks later (#28854) 2025-04-04 07:51:50 +00:00
warriorstar-orion
a3280c6464 pull last attacker data to atom level (#28824) 2025-04-03 14:09:39 +00:00
warriorstar-orion
071ecc371f refactor: remove unused var /mob/var/LAssailant (#28825) 2025-04-03 13:50:36 +00:00
Burzah
411625a7cf Initial commit (#28848) 2025-04-02 07:45:04 +00:00
warriorstar-orion
ff0c749f31 refactor: add commonly used investigate category defines (#28826) 2025-03-30 23:10:48 +00: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