cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-17 09:07:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
2934 Commits
Author SHA1 Message Date
QwertytofortyGitHubNathan WintersRyan
 		abf69a81d8 Overdosed chemicals no longer do helpful effects when overdosed (generally) (#20906) 
* Overdosed chemicals no longer do helpful effects when overdosed (generally)

* Update code/modules/reagents/chemistry/reagents_holder.dm

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

* balance request

* Update code/modules/reagents/chemistry/reagents_datum.dm

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

* od to overdose

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-05-02 21:28:50 +02:00
ContrabangandGitHub 282f1cb62c Nuke resprite revival (#20888) 
* nuclear revive

* stage fixes

* allows for the core to show while panel is closed

* adds blob nuke

* oops merge failure

* sirryan review

* grammar fix in comment
 2023-05-02 21:28:42 +02:00
KyaniGitHubHenri215Farie82
 		147c5890ef Chem heater now shows beakers when screwed closed (#20930) 
* Update chem_heater.dm

* Update code/modules/reagents/chemistry/machinery/chem_heater.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/reagents/chemistry/machinery/chem_heater.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-05-02 20:58:13 +02:00
Nathan WintersandGitHub efecd97f76 Slightly refactors adjustCloneLoss() and setCloneLoss() (#20838) 
* Fix 0 cloneloss unmutating all organs only 20% of the time

* Clean up the rest of `adjustCloneLoss()`

* Add missing `setCloneLoss()` override for carbons

* Fix setting cloneloss to 0 not unmutating organs

* Fix the code instead

* Someone forgot about this operator

* Sean review; minor cleanup

* Deduplicate mass unmutation

* gnarg
 2023-04-25 21:13:33 +02:00
Henri215andGitHub 6826d2ba7b Moving some in hand icons to different files (#20748) 
* Moving some icons out of left/righthand.dmi

* Moving sheets and ores
 2023-04-25 21:13:02 +02:00
Henri215andGitHub dc75a748f1 Fixing common spelling mistakes part 3 (#20870) 
* Fixing common spelling mistakes part 3

* collectable

* another collectable

* part 3.2

* "</span>."

* A bunch more fixes
 2023-04-22 09:44:27 +02:00
GDNandGitHub 51ad2070a5 buffs Potassium Iodide (#20845) 2023-04-22 09:43:36 +02:00
ZelfandGitHub 98fe72799f (serious) Resprites a majority of drinks/drink related objects + Adds Lean (#20793) 
* triple cheeseburger mcdonalds

* changing taste_desc of lean
 2023-04-22 09:28:19 +02:00
GDNandGitHub c2176e3598 makes #20471 work (#20739) 2023-04-22 09:18:17 +02:00
CocacolaguaGitHubCharlieLuc
 		1c75031712 Walking over syringes without protection injects (#20873) 
* gets injected... whoops!!

* rev1ew

* rev2ews

* r3vi3w

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* r4view

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

* review5

---------

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-04-21 20:34:40 +01:00
BurzahGitHubContrabangAdri
 		e85094ed32 ERT Medkit Revision (#20658) 
* Update code/modules/reagents/reagent_containers/pill.dm

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>

* Seperated the Red and Gamma Patch Packs
Changed some colors for the patch packs/pill bottles

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

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

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

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

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

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

* adjustments to patch packs

* format fix

* inheritance adjustment

* adjusted medince to reflect changes to SR

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-04-15 21:59:19 +02:00
GDNandGitHub 87d69f93b4 Balances the borghydro (#20660) 
* Balances the borghydro

* better comment
 2023-04-15 21:59:11 +02:00
CharlieGitHubFarie82Nathan Winters
 		e6085895c1 burn wounds, for real this time (#20542) 
* burn wounds

* user feedback

* ready for review

* sean review

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* surgery fix

* other repair methods

* GDN review

* health scanner feedback

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

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

* bodyscanner print out

* Update code/game/machinery/adv_med.dm

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
 2023-04-14 15:58:38 +02:00
Nathan WintersandGitHub ddbae79e7a Removes a duplicate definition of Hot Chocolate (#20836) 
* Merge this

* Move that
 2023-04-08 19:49:57 +01:00
GDNGitHubRyan
 		7727e5d91b Changelings are no longer gibbed by SR (#20507) 
* Changelings are no longer gibbed by SR

* forgot to remove this 💀

* actually balance just wants this

* Update code/modules/reagents/chemistry/reagents/medicine.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-04-04 09:47:33 +01:00
MisterMovieandGitHub 7b4491f31a Fixes a bug with chemistry and medical machines. (#20504) 
* Fixes a bug with chemistry machines.

* Fixes cryo cells and sleepers

* lewcc's request
 2023-03-27 21:18:48 +02:00
AlantodneandGitHub b6086b110a Buffs Mediborg abductor module to affect medihypo (#20471) 
* Buffs Mediborg abductor module to affect medihypo

* Adds the missing space
 2023-03-26 12:23:36 +01:00
GDNandGitHub 1f1166c222 most reagent dispensers are no longer automatically anchored (#20613) 
* most reagent dispensers are no longer automatically anchored

* water cooler is now anchored

* ryan's request
 2023-03-26 12:05:18 +01:00
JimKil3andGitHub 845c842f14 Renames Strange Reagent to Lazarus Reagent (#20614) 
* the great renamining
also changes the description to be more flavorful

* capitalization
 2023-03-26 12:04:02 +01:00
GDNandGitHub ccac40732b Fixes cooking machines making a runtime whenever they process a reagent without a normal reaction (#20697) 2023-03-26 11:46:43 +01:00
GDNandGitHub 66831d6a8a Reworks the cyborg hypospray (#20050) 
* Borg hypo rework + radial menu

* bam
 2023-03-17 09:56:43 -05:00
Vi3triceandGitHub a2fa356861 yummy (#20522) 2023-03-13 22:26:42 +00:00
BurzahGitHubHenri215
 		30e461f60a Ert medic kit rework (#20561) 
* First commit for ERT medic kit rework

* Value adjustment for pill bottles and patch pack
This was intended for the first commit

* removes the empty containers previously created

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

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

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

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Merge conflict resolution

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-03-13 22:53:47 +01:00
Vi3triceandGitHub 6048b1ba1e Robot clean (#20497) 2023-03-08 20:15:48 +01:00
GDNGitHubS34N
 		626d2754d5 objective items being destroyed are now logged (#20485) 
* objective items being destroyed is now logged

* signal time

* oop

* Update code/modules/projectiles/guns/energy/laser.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update code/game/objects/items/documents.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* mira review

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-03-08 20:15:16 +01:00
GDNGitHubLuc
 		dd47769567 combat defib tweaks, moved out of the medikit (#20379) 
* moves the combat defib out of the first aid kit, tweaks both costs

* no more synthflesh patches

* i just a little stupid

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

* we just a little stupid

* deletes stims, really not needed

webedit lol

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-03-06 23:47:00 -05:00
GDNandGitHub ce5b670747 fixes being unable to deconstruct reagent grinders (#20458) 2023-02-27 11:10:38 -06:00
GDNandGitHub 420827ca76 fixes a acid dreams runtime (#20441) 2023-02-21 21:03:20 +00:00
McRamonandGitHub ca8e423172 Hyposprays and Injectors resprite (#20281) 
* sprites

* lil_fix_the_rapper

* Update belts.dmi

belt icons

* Update hypo.dmi

little fix
 2023-02-17 22:38:14 +00:00
Henri215andGitHub 4723cc05d8 Renames the CMO hypospray (#20227) 2023-02-14 20:30:50 +01:00
GDNGitHubHenri215
 		aa56d75f93 [Ready for code review] Moves alien verbs to spells (#20002) 
* Moves alien verbs to spells

* lol

* Standardization, polish, making alien plasma huds more consistant

* The very cursed way of handling touch spells

* logging + more polish

* snakecase + documentation

* finishing touches

* oops, ty henri

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* sprites from TGstation

* sprites, again

* oops

* farie's review part 1

* farie's review p2, signals

* Erics PR compat

* farie's review 3

* that too

* the shawnshank redemption

* boink

* removes larva transfer plasma

* you want a sprite cranberry?

* TM fix 1

* FUCK I BROKE LOGGING

* bam

* final touches

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-02-12 21:34:11 +01:00
Henri215andGitHub 42d1758b2e Fixing common spelling mistakes part 2 (#20360) 
* Fixing common spelling mistakes part 2

* "supressed"
 2023-02-08 21:20:35 +01:00
Coolrune206andGitHub d5db2bc74a Vulp/Taj Chocolate and Darksight (#20275) 
* vulp chocolate weakness and darksight 4

* monkeys forms (farwa and wolpin)

* adds hot chocolate and cocoa

* this-a-fix-it?
 2023-02-08 13:03:30 -06:00
1080pCatGitHubS34N
 		eee723cd73 Adds mannitol and salbutamol to medical borgs hypospray (#20239) 
* Update borghydro.dm

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-02-04 18:25:30 -06:00
AffectedArc07andGitHub b34e8fa301 [READY] CI now bans files with the same name (#20195) 
* CI now bans files with the same name

* Part 1

* Warriorstar python tweaks

* Part Deux

* Fix unticked

* fix
 2023-02-04 16:33:41 -06:00
Henri215andGitHub c4667311e7 Janitorial equipment tweaks and cleaners availability (#20037) 
* Janitorial equipment tweaks and advanced cleaner

* cleaner availability tweaks

* old cleaner for drones

* Mop capacity buff

* advanced cleaner for sol traders

* conflict part 1

* Merge branch 'master' into janitorial_tweaks

* Revert "Merge branch 'master' into janitorial_tweaks"

This reverts commit 47129ea819.

* Revert "Revert "Merge branch 'master' into janitorial_tweaks""

This reverts commit a8c520b069.

* hahahahaha

* hahaha part 2

* hahaha part 3

* cerestation edit

* adv cleaner comes with 500 now and ERT belt

* lube spray upper case and moving it to spray.dm
 2023-02-03 13:10:51 -06:00
RyanGitHubHenri215
 		7c3cd86f14 APC & Machinery Refactor + Local Powernets (#19991) 
* local powernet and machine power refactor

* some fixes

* more tweaks + powerchange() refactor

* fixes var edited apcs on meatpackers.dmm

* fixes issue with power channels

* Reviews

* delta fix

* Update code/game/machinery/portable_turret.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* removed area power change proc

* damn morgues

* requested changes

* request changes

* deconfliction

* mapping fixes

* some fixes from TM

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-01-30 22:28:10 +00:00
warriorstar-orionandGitHub b790e6d5e2 Whitespace cleanup part 4. (#20226) 2023-01-20 19:40:42 -05:00
LucandGitHub 9ba005de9f Add themselves as a pronoun helper, fixes some usages of it (#20184) 
* Add themselves helper

* Testing and replacing

* Fixes some non-standard usages
 2023-01-20 19:28:48 -05:00
LucGitHubFarie82S34NRyan
 		b940c1eb21 Allows clings to regenerate without a brain. (#19856) 
* Move brain organ code where it belongs

* Rename too

* WIP, but hey, it kinda works now.

* Account for a few missing heads

* Remove vital check, killing the user on death

* Let defibs and scanners better deal with these

* Remove debug brains

* Clean up some more contingencies

* More head checks

* Update code/modules/antagonists/changeling/datum_changeling.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Fixes up signal business

* some stuff from sean's review

* Add some type safety checks for heads

* oops

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

get this in there too

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Remove decap sword

* Quick suggestions

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

* Addresses shedding problems

* Add new defib changes

* this is why we have CI

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-01-20 19:25:51 -05:00
GDNandGitHub 311cdae455 Converts some borg equipment to radial menus (#20044) 
* Borg stuff radial menus; I hate borg hypos

* sneaky

* borghypo can be it's own thing

* forgot ya

* ryan's review
 2023-01-20 18:59:35 -05:00
S34NandGitHub c16481c076 removes smallhelath (#20237) 2023-01-19 15:36:27 -05:00
Coolrune206andGitHub bf4212d24a Soap stops swearing (#20162) 
* technically functional

* technically functional

* more logically coded, credit to Contra and Mira

* yes this is more logical

* Sean and Fox reviews

* webeditor heresy
 2023-01-18 11:32:28 -05:00
Coolrune206GitHubLuc
 		71d7eb1de0 Removes the Speed-boost from Cling Epi OD (#20127) 
* gives the wizard some more clownish options

* removes speed boost from cling Epi OD

* Revert "gives the wizard some more clownish options"

This reverts commit 938b1c8ebd.

* Lewcc review

Whack

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

* Hal9001 Review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-01-13 17:06:01 +01:00
Henri215andGitHub e711cd5921 Fixes lots of common spelling mistakes (#20086) 
* Fixes common spelling errors: "atleast", "infront", "succesfully", "alot"

* recieve -> receive

* spelling mistakes: percieve, wierd, posession, seperate, succesful

* Spelling mistakes: noticable, concious, enviroment, existance, foward, interupted, independant

* tgui rebuild

* lets make this run

* "succeded" mispelling

* reverting money spam change
 2023-01-08 20:12:31 -05:00
Henri215andGitHub 515ee2671c Tweaks to unfasten times (#19996) 2023-01-06 21:57:28 +01:00
AffectedArc07andGitHub e91b6c94f7 Renames QDEL_LIST to QDEL_LIST_CONTENTS (#20006) 
* Renames QDEL_LIST to QDEL_LIST_CONTENTS

* derp
 2022-12-29 14:28:40 +00:00
warriorstar-orionandGitHub a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
warriorstar-orionandGitHub 8f8f2ec574 Move reagent documentation to dmdoc. (#19888) 
* Move reagent documentation to dmdoc.

* Cleanups
 2022-12-14 16:17:17 -05:00
PacifistDalekGitHubSirryan2002
 		363464801c Ice Cream Cone Tweaks and New Sprites redux (#19544) 
* Ice Cream, reagent colour, and drink colour update

* re-add accidentally removed drink

* updates for lewcc and sean's review

* a few new names and updates for lewcc's review

* adding S34N's suggestion

* fix merge comflict

* Update code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/desserts.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* modified things as per Sirryan's review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-12-12 22:15:43 -05:00