cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 00:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,263 Commits 26 Branches 2 Tags
62372ec261ccb6044482ad66411aa720b05045bb
Commit Graph

2559 Commits

Author SHA1 Message Date
Coolrune206
5dcd23f17c Puts a cap on the size of Water-Potassium explosions (#21315) 
* caps water pot explosions

* Sirryan request

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-06-28 15:13:41 +01:00
HMBGERDO
b9d106886e Buffs stimulative agent (#21349) 
* buffs stimulative agent

* 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-06-26 20:34:15 -05:00
Nathan Winters
58a5fc9e46 Make reagents adjust temperature towards actual bodytemp (#20821) 2023-06-22 17:30:02 +01:00
Qwertytoforty
0bf677fb7e Sarin now works overdosed again (#21402) 2023-06-20 22:52:33 +01:00
Coolrune206
6e278f2841 prevents silver slimes from generating wiz mugs (#21307) 2023-06-16 18:51:43 +01:00
Qwertytoforty
65fc546a23 Blacklists some other bottles from silver slimes (#21309) 2023-06-15 21:20:31 +01:00
HMBGERDO
fcbd8174e6 Slowdown on pulling (#21056) 
* slowdown on pulling

* slowdown only when pulling structure or machinery

* moving speed modifier to /mob/living/carbon instead of all atoms

* added pull_speed to /atom/movable, moved movement_delay proc to carbon/human

* no-slowdown-trash-bin

* Update code/game/atoms_movable.dm

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

* removed pull_speed on /obj/item/storage/bag/trash, no need to set this

* more 0 pull_speed objects

* added gravity check, moved pull_speed to /obj

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-06-07 20:08:25 +01:00
Nathan Winters
8a55bc6d9c QoL Unhusking tweaks (#21197) 
* Make splashed Synthflesh penetrate skin

* Allow Synthflesh to unhusk on ingestion reactions

* Add a tiny bit of intuitive leeway to the unhusk damage threshold

* 310 characters line moment

* Fix missing closing tag, gnarg
 2023-06-05 12:06:41 +01:00
JimKil3
7b7a005232 makes the tweak (#21195) 2023-06-05 12:04:33 +01:00
DGamerL
173bfb92f5 Removes bio resist from the code (#21108) 
* BIO armor is kill

* some more stuff that uses bio resist

* I did a scuffed merge conflict solve but it works
 2023-06-03 09:50:22 +01:00
Qwertytoforty
8e6ed2f284 [serious april pr pls no close] Adds the magic nanny bag. (#20774) 
* IT'S NOT A GRANNY BAG

* other tweaks to put out

* Restricted on raging

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

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

* defined

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

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

* changes requested

* no slime coring the super food

* actually let the pie live, the meds can be found in pill bottles in space, just not the steak

* merge conflict bullshit

* pain, suffering even

* icon handling

* M-M-M-ERGE CONFLICTS MY BELOVED

* Apply suggestions from code review

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

* s34n comments

* I can read and speak the english language™️

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-06-02 15:49:26 -05:00
Contrabang
3f87165a03 CI now bans files with the same name (PART 2) (#21051) 
* CI change

* world.dm

* .dme world.dm

* subsystem renaming

* .dme for subsystems

* ai_laws.dm

* armor.dm

* emote.dm

* logging.dm

* spell.dm

* air_alarm.dm

* crew.dm

* decal.dm

* emissive_blocker.dm

* footstep.dm

* spawner.dm

* fire.dm

* carbon.dm

* living.dm

* mob.dm

* movement.dm

* thermal_drill.dm

* plasmamen.dm

* lavaland.dm

* chaplain.dm

* lightning.dm

* magnet.dm

* mimic.dm

* wizard.dm

* morph.dm

* vampire.dm

* click.dm

* self.dm

* radiation_storm.dm

* airlock.dm

* autolathe.dm

* mulebot.dm

* nuclearbomb.dm

* particle_accelerator.dm

* smartfridge.dm

* syndicatebomb.dm

* vending.dm

* wires.dm

* sound.dm

* mining.dm

* syndicate_space_base.dm

* monkey.dm

* guardian.dm

* bomb.dm

* standard.dm

* nuclear.dm

* pinpointer.dm

* access.dm

* departments.dm

* job.dm

* science.dm

* buttons.dm

* cloning.dm

* igniter.dm

* wishgranter.dm

* atmos_control.dm

* message.dm

* power_monitor.dm

* mecha.dm

* combat.dm

* mining_tools.dm

* meteors.dm

* spiders.dm

* contraband.dm

* aliens.dm

* uplinks.dm

* voice.dm

* intercom.dm

* lights.dm

* robot_items.dm

* mineral.dm

* dice.dm

* extinguisher.dm

* paint.dm

* signs.dm

* staff.dm

* smokebomb.dm

* boxes.dm

* random.dm

* janicart.dm

* statue.dm

* cargo.dm

* asteroid.dm

* headslug.dm

* fulton.dm

* atmospherics.dm

* pump.dm

* corpse.dm

* oldstation.dm

* gps.dm

* preferences.dm

* clothing.dm

* ears.dm

* glasses.dm

* boxing.dm

* color.dm

* renames ninja gear files

* recipes.dm

* error_handler.dm

* anomaly.dm

* floorcluwne.dm

* undead.dm

* overmind.dm

* shield.dm

* bottle.dm

* organ.dm

* piano.dm

* plasma_fist.dm

* language.dm

* mob_defines.dm

* mob_helpers.dm

* damage_procs.dm

* _defines.dm

* empress.dm and queen.dm

* brain.dm

* organ file renaming

* subsystems.dm

* constructs.dm

* bot.dm

* pet.dm

* nature.dm

* magic.dm

* colors.dm

* drugs.dm

* medicine.dm

* toxins.dm

* shuttle.dm

* surgery.dm

* moves a bunch of define files

* traits.dm

* names.dm

* other_mobs.dm

* flags.dm

* some final define files

* well turns out contractor_pinpointer.dm was  taken

* I forgot to remove this file

* how in the hell did this get unticked

* I DID INCLUDE IT, but there was a "w" there

* swaps the world definitions

* camera renamed to SScamera

* examine -> alien_examine
 2023-06-02 14:30:17 -05:00
Taran
09132de5a6 Makes it so nano calcium always fixes broken bones, and IB and lowers weaken time (#21170) 2023-06-02 20:09:00 +01:00
Nathan Winters
1d21abbeeb Oil temperature reaction tweaks (#21201) 2023-06-02 19:57:40 +01:00
efzapa
214be6753f adds mint to mojito recipe (#21112) 
* adds mint to mojito recipe

* byond when you miss a single character
 2023-06-02 18:09:24 +01:00
ppi13
70abf0bf81 Buffs morphine duration (#21107) 
* Buffs morphine duration

* Updates cycles to fit current cycles

before 15 units took 37.5 cycles now they do 60 cycles.

* Revert "Updates cycles to fit current cycles"

This reverts commit cc2202356c.
 2023-06-02 18:06:14 +01:00
Qwertytoforty
1a55ef9bc2 morphine now processes on OD (#21102) 2023-06-02 18:00:36 +01:00
S34N
bdb8039c8f Adds gorillas and cargorillas (#20830) 
* goril

* goril2

* arms

* goril3

* goril4

* rampaging

* emote

* trait

* more gorilla

* ooga

* Magillitis Serum Autoinjector, crates

* return to monke

* remove unused trait

* oops

* sirryan

* earth

* Update code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm

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

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

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

* fixes and stuff

* gorilla text clarification

* tweak probs, stop if dead

* volume

* gorilla sleeping attack

* Apply suggestions from code review

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@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: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
 2023-06-01 18:36:07 -05:00
Nathan Winters
8000a0e40b Converts Perfluorodecalin's side-effect into an actual overdose (#21081) 
* Converts Perfluorodecalin's side-effect into actual overdose

* Make Perfluorodecalin heal its own OD again
 2023-05-22 22:24:53 +02:00
Contrabang
6c295638cb Buffs Adminordrazine against stamina and cold (#21044) 
* buff juice

* handles no dna case

* comments are good too

* hal review
 2023-05-17 17:31:51 +01:00
Qwertytoforty
0135644e07 Chemicals that reduce pain make the users personal health bar less accurate (#20970) 
* Chemicals that reduce pain make the users personal health bar less accurate

* Update medicine.dm

* health doll accuracy / screen cover

* define that shit

* makes it a proc
 2023-05-14 00:24:21 +02:00
GDN
092fe017a5 Tea heals a bit more if you're british (#21068) 
* chav now gives slight healing on tea

* Update code/_globalvars/traits.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-05-12 07:52:55 +01:00
Nathan Winters
376858d908 Fix 0.1u reagent amounts behaving inconsistently (#20969) 2023-05-10 14:05:34 -05:00
Kyani
060bc0d741 Fixed Jestosterone removing clown waddles (#21035) 
* Update misc_reagents.dm

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2023-05-05 15:48:52 -05:00
Kyani
87201198ef fixes cherry bombs (#20921) 
* fixes cherry bombs

moves prime to AFTER the auto-throw is toggled
added a sleep before the explosion trigger to prevent instant explosions
reafactor'd black powder to explode at its container's location instead of where the black powder's trigger is, to prevent desync between the explosion location and a thrown object

* removed sleep

mistook the desync before as an instant explosion. now that desync was fixed it is shown to not be needed

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

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

* comments added

* renames location to prime_location

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-05-05 21:21:11 +02:00
Qwertytoforty
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
Contrabang
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
Kyani
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 Winters
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
Henri215
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
Henri215
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
GDN
51ad2070a5 buffs Potassium Iodide (#20845) 2023-04-22 09:43:36 +02:00
Zelf
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
GDN
c2176e3598 makes #20471 work (#20739) 2023-04-22 09:18:17 +02:00
Cocacolagua
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
Burzah
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
GDN
87d69f93b4 Balances the borghydro (#20660) 
* Balances the borghydro

* better comment
 2023-04-15 21:59:11 +02:00
Charlie
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 Winters
ddbae79e7a Removes a duplicate definition of Hot Chocolate (#20836) 
* Merge this

* Move that
 2023-04-08 19:49:57 +01:00
GDN
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
MisterMovie
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
Alantodne
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
GDN
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
JimKil3
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
GDN
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
GDN
66831d6a8a Reworks the cyborg hypospray (#20050) 
* Borg hypo rework + radial menu

* bam
 2023-03-17 09:56:43 -05:00
Vi3trice
a2fa356861 yummy (#20522) 2023-03-13 22:26:42 +00:00
Burzah
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
Vi3trice
6048b1ba1e Robot clean (#20497) 2023-03-08 20:15:48 +01:00
GDN
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