cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 14 Branches 2 Tags
dev-docs-readme
Commit Graph
44579 Commits
Author SHA1 Message Date
DGamerLandGitHub c12d0346a1 aaaaaa (#26080) 2024-06-29 01:59:20 +00:00
Spaghetti-bitandGitHub fc7bc29245 Adds the sec great coat. Does not include kidan as mcramon plans to remove their shoulder pads. (#26071) 2024-06-28 22:17:47 +00:00
LucGitHubMattDGamerL
 		bfb9e8c132 Refactors Foam (#25436) 
* foam starts

* foam fixes

* foam foam foam

* remove widefoam, get cleaning grenades working as they should

* sirryan reeview

* Apply suggestions from code review

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

* Apply suggestions from code review

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

* locs good to me

* dgamer review

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-28 20:39:26 +00:00
DGamerLandGitHub efd6f2dfa6 Removes all locate() calls in block() (#25772) 
* Removes all `locate()` calls in `block()`

* Maybe actually push fixes

* Revert bad merge master

* Forgot this one

* Maybe actually push fixes

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-28 20:33:38 +00:00
MigratingcocofruitandGitHub 6db06b1eb8 Plant DNA Manipulator update (#25370) 
* WIP

* changes

* more changes

* chnges

* update

* changes

* I suck at TGUI if you see this please help

* UI a bit better still figuring it out

* More things

* Eject Select, Select empty and autoselect empty implemented. can insert replaace stat/all stats from disk list

* Ready to make a PR

Disks can be loaded into the machine from boxed, an empty disk is automatically selected once an extraction is performed if one is available. All insert and replace buttons moved to the disk lists. Window size and scaling changed to fit LSD properly without wrapping.

* minor ui tweak, fixes core stat disk being auto selected unintentionally. Loading via box now makes a sound.

* rebuild TGUI

* rebuild tgui

* implemented RO button/indicator in UI, Added null checks for can_add

* slightly shrink some buttons rebuild TGUI

* Rebuild TGUI

* use istype for type checks

* removes the disk compartmentalizer from maps

* removes Disk Compartmentalizer

* actually removes the disk compartmentalizer

* rebuild tgui and remove all remaining disk compartmentalizer sprites

* fixes a message being output to world instead of the user

* auto doc and readability improvements.

* some fixes

adjusts display name to display the new doubled percentages. Stored seed no longer counts as a disk for the purpose of reaching the disk capacity.

* Rebuild TGUI
 2024-06-28 18:57:32 +00:00
chuga-gitandGitHub a423a008e8 Refactors preparePixelProjectile (#25567) 
* preparePixelProjectile now just takes a target and source atom as parameters

* remove commented out code

* ahem

* hopefully fixes null target nonsense in colossus

* those who cannot remember the past are condemned to repeat It

* i just woke up in a cold sweat at 5am in realization

* reverts back to client-view based firing if source is a mob
 2024-06-28 18:12:42 +00:00
Spaghetti-bitandGitHub 4f3f845e16 Fixes IPCs being invisible! (#26073) 2024-06-28 07:21:41 +00:00
BiancaWilksonGitHubNathan Winters
 		f9288b194c Antagbanned people can join the ghost bar (#25869) 
* Antagbanned people can be a ghost

* Update code/modules/awaymissions/mob_spawn.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>

---------

Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
 2024-06-28 03:36:07 +00:00
warriorstar-orionandGitHub c844c3ae06 mapping: create directional helpers for fire alarms. (#25897) 
* mapping: create directional helpers for fire alarms.

* set PR number
 2024-06-28 03:33:49 +00:00
William AndersonGitHubRyanDGamerL
 		cd4f3c4eb9 Adds hydroponic HUD implant (#25948) 
* Created hydroponic HUD implant

Created a hydroponic HUD implant to match the medical, security, diagnostic, and janitorial implants.

* Update code/modules/research/designs/medical_designs.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: William Anderson <williamharrisanderson@gmail.com>

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

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

---------

Signed-off-by: William Anderson <williamharrisanderson@gmail.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-28 03:24:33 +00:00
datloandGitHub 149f7ca6ea Adds Tarot to the Chaos Staff (#25918) 
* Add tarot packs and decks to chaos staff gifts

* woopsy

* adds forced tarot card

* woopsy daisy

* bruh

* add mind check
 2024-06-28 03:19:59 +00:00
1080pCatandGitHub a318395a7c removes abortions.oog (#25854) 2024-06-28 03:18:05 +00:00
chuga-gitGitHubContrabang
 		43b7fa5ed9 Gargantua Blood Rush now removes bolas (#25989) 
* gargantua bloodrush now clears legcuffs, slightly refactors removing restraints

* comment tweaks, prevents blood rush from being used when buckled.

* Update code/modules/mob/living/carbon/carbon_procs.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com>

---------

Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-06-28 03:16:55 +00:00
BiancaWilksonandGitHub f04b513dd7 Brains can ghost (#26003) 2024-06-28 03:16:49 +00:00
PedroandGitHub 9a851addbf Pandemic no longer shows heart failure/shock (#25992) 
* Critical/Shock now invisible to pandemic!

* Moved visibility flag to datum
 2024-06-28 03:16:45 +00:00
CRUNCHandGitHub add100e4d5 Expands the Cigarette Vendor Inventory (#25925) 
* Cig Shopping Enhancement

* Yes

* I missed one.

Didn't realise that these cigs do actually spawn in maints and are thus in the game.
 2024-06-28 03:16:42 +00:00
datloGitHub1080pCatLucCharlie NolanDGamerL
 		882deeff51 Make magic disguises easier to break, reworks its spell cast (#25929) 
* Make magic disguise easier to break

* add hitby

* add signal check

* update comment

* Fix check and update spell description

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* added signal to atom

* Revert "added signal to atom"

This reverts commit 79e2aa68d8.

* Update code/datums/spells/disguise_self.dm

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: datlo <quentinkoyote@gmail.com>

* adress review, add spin casting

* linter fix

* actually fix linters

* i am so dumb

* fix typo

* Update code/modules/mob/living/carbon/human/species/_species.dm

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

---------

Signed-off-by: datlo <quentinkoyote@gmail.com>
Signed-off-by: DGamerL <108773801+DGamerL@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: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-28 03:16:39 +00:00
CRUNCHGitHubDGamerL
 		bb2e96792b Tweaks the Light Replacer (#25932) 
* Light Replacer Enhancement

* Update code/game/objects/items/devices/lightreplacer.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update

* Update lightreplacer.dm

* Update lightreplacer.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-28 03:16:37 +00:00
CRUNCHandGitHub 62a7d79358 Update cigs.dm (#25842) 2024-06-28 03:16:32 +00:00
CRUNCHandGitHub ee6879ad7b Replaces the Nicotine in Rollies With Weed (#25840) 
* Update cigs.dm

* Update cigs.dm
 2024-06-28 03:15:33 +00:00
AdrerGitHubadrermail@gmail.com <adrermail@gmail.com>
 		f3d069ae81 CC announcements now require you to understand the language they were written in (#25825) 
* Replica syndicate space suit sprites

* Revert "Replica syndicate space suit sprites"

This reverts commit 1fb5cf68ac.

* Global announcer now respects language

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-06-28 03:11:49 +00:00
Spaghetti-bitGitHubRyan
 		1f46b4515d [FRAMEWORK / SPRITES] Species Specific Augments (Robotic Limbs) - Phase 1 - Vox (#25795) 
* Adds framework for species specific augments. Adds shellguard vox augment

* Hesphiastos vox augments done.

* Fixes heph not loading properly.

* Update to hesphiastos

* Updates hesphiastos and adds wardtakashi. Also sets the default for all vox augments to ward

* Defaults to ward

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>

---------

Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-06-28 03:09:58 +00:00
PollardTheDragonGitHubDGamerL
 		48f429e307 Added smoketime calc to adding reagents (#25933) 
* Added smoketime calc to adding reagents

* Math fix

* Spacing

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

* Improved calculation

* SIMPLIFICATION MATH

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-28 03:08:46 +00:00
CRUNCHandGitHub c1bb670a7e Update pronouns.dm (#25988) 2024-06-28 03:04:08 +00:00
DGamerLandGitHub a3af356e55 New bag sprites by Alexios! (#25810) 
* New bag sprites!

* New biobag sprite
 2024-06-28 02:05:04 +00:00
HMBGERDOandGitHub 5ccce78ba0 last tweaks (#26060) 2024-06-27 21:47:56 +00:00
chuga-gitandGitHub da42a1c2f6 Refactors throwing (#25946) 
* refactors datum/thrownthing

* cleanup

* lewc review

* calling parent doesn't do anything lmao
 2024-06-26 21:03:51 +00:00
HMBGERDOandGitHub 936d19c0a0 Blood spread fixes and tweaks (#26048) 
* blood spread fixes and tweaks

* just to make sure

* soap cant be bloodied, better check on gloves
 2024-06-26 20:57:30 +00:00
DGamerLandGitHub 211fd3c7fb Removes meh proc (#26044) 2024-06-26 20:40:10 +00:00
DGamerLandGitHub ed7782ad4c Adds the oneuse autosurgeon (#25978) 2024-06-26 20:38:53 +00:00
QwertytofortyandGitHub 59baefe254 did you know in terms of sane code pod doors (#26050) 2024-06-26 20:30:10 +00:00
BiancaWilksonandGitHub a35abcdd29 begone typo (#26049) 2024-06-26 19:13:41 +00:00
RyanGitHubDGamerL
 		ae055a21d2 NanoBank Premium: Remote Approval of Departmental Cargo Crates! (#25871) 
* NanoBank Premium

* TGUI prettier

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* default case for request notice

---------

Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-26 18:03:50 +00:00
QwertytofortyandGitHub 4931d9fded fixes hoverboards from mining giving the wrong item (#26047) 2024-06-26 15:12:18 +00:00
QwertytofortyGitHubDGamerLHenri215LucMattRyan
 		f6b8d87e78 Adds sscooters and skateboards [serious pr do not close after AFD] (#24934) 
* WORLD WIDE NOISE

* Makes it pass CI, tweaks values, glass table hoverboard, and railing grinding

* grind on pipes

* https://youtu.be/cTiM1MJ1o7c?feature=shared

* https://youtu.be/Jc6CHI9f6cM?feature=shared

* temporary change for icon conflicts (hopefully)

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* The rest of the fun loving owl

* missed this one

* Apply suggestions from code review

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

* changes

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* Update code/modules/vehicle/tg_vehicles/tg_vehicles.dm

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

* I love stealth conflicts!

* purge lines

* Apply suggestions from code review

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

* Update tg_vehicles.dm

* works works works

* Update code/modules/vehicle/tg_vehicles/tg_vehicles.dm

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

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-06-25 21:38:40 +00:00
HMBGERDOandGitHub d88ddea05c Touching bloody objects will make your hands/gloves bloody. (#25730) 
* bloody blood

* no restrictions of item blood

* PR reviews

* comment
 2024-06-25 21:31:00 +00:00
Spaghetti-bitGitHubLuc
 		457f9ff04f [TWEAK] Bio-Chip Pad Renaming Tracker Bio-Cips (#25617) 
* Allows the biochip pad to change the GPS tag on the tracker implant. No more standard 'TRACK0' on everything.

Updates the UI for the biochip pad.
Adds the biochip pad to the protolathe under the medical tab

* Prettier!!! :)

* Moves the "tag" property below the general blurbs.

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>

* Merge Conflict Fix (1/2)

* MC (1.5/2)

* Merge Conflict Resolution (Hopefully)

---------

Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-06-25 21:29:45 +00:00
larentounandGitHub 6b70c59c96 Some LWAP (and other scoped weapons) fixes (#25775) 
* can't use lwap from lockers

* active hand flag

* rename SCOPE_CLICK_MIDDLE
 2024-06-25 21:28:18 +00:00
QwertytofortyGitHubLucRyanSheepDGamerL
 		1166c3dcd3 Reworks the AI hijack objective again. (#25603) 
* wip for htis

* improves the AI block objective

* revenant moment

* no shuttling when doomsdaying

* don't say it I know I know I suck

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* requested changes

* Update code/modules/shuttle/emergency.dm

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

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-25 20:34:20 +00:00
Charlie NolanandGitHub f7ca88e139 Fix supply shuttle forgetting to bring stuff. (#26030) 2024-06-25 10:35:43 +00:00
QwertytofortyandGitHub 1877ee7345 lavaland spaces itself 5% less (#26012) 2024-06-25 10:34:56 +00:00
FaronandGitHub ef3162121a Fixes clones being stuck mindslaved (#25981) 
* Update clonepod.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update clonepod.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update bio_chip_traitor.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update datum_mindslave.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update datum_mindslave.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Create misc_mindslave.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update paradise.dme

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

---------

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>
 2024-06-25 10:34:22 +00:00
DGamerLandGitHub edf091a7e7 Less germs (#25959) 2024-06-24 22:28:06 +00:00
ZackandGitHub 8a436677c2 Fixes the wall names on wizard crashed ship space ruin (#25958) 
* Update wizardcrash.dmm

* Update wizardcrash.dmm

* Update wizardcrash.dmm

* Update walls_mineral.dm

* Update walls_mineral.dm

* Update wizardcrash.dmm
 2024-06-24 19:29:09 +00:00
LucandGitHub 017989e27a better follow handling for admins (#25996) 2024-06-24 08:36:01 +00:00
matttheficusandGitHub 9d1e1ba40e Judo Storage Slots + Changes to Combos (#25659) 
* this might be a lot i dunno

* forgor status for armbar

* armbar tweak

* DGamerL Review

* merge issue fixed
 2024-06-23 10:53:00 +00:00
QwertytofortyandGitHub e7adf789e1 bluespace spellblade and modsuit teleporter module work better (#25900) 
* bluespace spellblade and modsuit teleporter module work better

* nah this should stay 7

* 7 ate 9
 2024-06-22 23:16:01 +00:00
LucandGitHub 32d4a2ecf4 fixes defibs sometimes treating heart attacks instead of death (#25995) 2024-06-22 22:52:18 +00:00
1080pCatGitHubDGamerL
 		a960b7de6d Standardises the comments in items.dm (#25889) 
* Adds heaps of auto docs, as well as cleansup/standadises most comments

* DGL review

* Update items.dm

* Update items.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

* Update items.dm

---------

Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-22 22:45:32 +00:00
dearmochiandGitHub 17ff2d52e7 Removes cuffed click CD to fix handcuffed alert not working (#25879) 2024-06-22 22:45:28 +00:00