Commit Graph

2579 Commits

Author SHA1 Message Date
1080pCat
34622bcfe4 16 minutes is way too long (#21741) 2023-08-12 18:22:36 +01:00
Contrabang
b1eda77f01 Adds happiness (a new chemical) (#21718)
* Adds happiness

* epic linter fail

* epic comma fail

* fuck i forgot to change the name

* deconflict it PROPERLY

* jimkil review
2023-08-12 18:22:18 +01:00
Burzah
f599d87dcf Fixes blumpkin juicing (#21947)
* blumpkin juicing fix

* there can be only one
2023-08-11 15:34:23 +01:00
Burzah
d5a719ac3a pills into patch pack fix (#21908) 2023-08-05 13:37:24 -05:00
Qwertytoforty
8336eecd00 Nerfs suitless spacewalking: Cryoxodone now stuns while healing. (#21556)
* qwerty remeber you made this and publish this

* removes comment due to testing

* just change tcryo dofus

* Cryox that is ingested will not work as it freezes in your mouth

* hmm yes

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

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-05 14:13:35 +01:00
Gatchapod
96eb6278b8 New name for Irish Car Bomb drink (#21781)
* More friendly Irish references

* Fixing description

* Adding an A

---------

Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-07-27 20:48:31 +01:00
GDN
067ce5670e removes uses of << sound, replaces with send_sound (#21774)
* removes uses of << sound, replaces with send_sound

* readds sound wrappers
2023-07-27 15:57:04 +01:00
Bjamcham
94e25a7fcb Chem Dispensers no longer work while unanchored (#21685)
* Goodbye mobile dispensers

* Fixes message
2023-07-24 15:31:07 +01:00
DGamerL
49ccd5b93c Fixes a weird pixel offset and typo on the beer nuke (#21794)
* okay this should work

* the not map change

* how the fuck did this get in here
2023-07-23 20:02:41 +01:00
Octus
efae994330 Restricts Xenomicrobes to admin only and trader shuttle, yes the funny become a biohazard instant reagent (#21506)
* removes all mention of xeno microbes from the code

* xenomicrobes are now just bus

* Update disease.dm

* bro hit me with a 🤨

* Update debris3.dmm

* returns it back to the rare meds list (i thought this was a pill list that spawned it)
2023-07-22 11:09:22 +01:00
AffectedArc07
8d7e066471 Adds OpenDream as a CI lint (#21099)
* Initial Commit

* Makes the CI work (maybe)

* Of course CI has a hissy fit

* Actually fixes the codebase

* Oops 1

* Tweaks

* oops
2023-07-18 20:50:31 -05:00
Nathan Winters
cacdf1b198 Fix vaccines not merging properly (#21601) 2023-07-16 12:00:27 -05:00
Nathan Winters
2ddbf8e6fd [s] Fixes some blood properties not interacting properly (#21647)
* Minor cleanup

* Fix blood not merging some properties properly
2023-07-13 11:53:20 -05:00
Qwertytoforty
9199a31eac Buffs most stamina drugs. Nerfs meth stamina ***SLIGHTLY*** (#21478)
* Buffs drugs. Nerfs meth stamina ***SLIGHTLY***

* 1==2

* oh right *that* chemical

* "that's not salt, it's sodiumchloride"
2023-07-12 17:52:32 +01:00
JimKil3
083b74ec85 Adds Sanguine and Osseous Reagent (#21148)
* SR (not strange reagent)

* Osseous Reagent

* i forgor the recipe

* typecasting tweak

* SR tweaks

* bone tumor tweaks

* SR overdose buff

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

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

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

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

* Apply suggestions from code review

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

* makes SR actually work
oops 🤪

* guard clause

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-07-11 14:46:48 +01:00
BiancaWilkson
978f43c5e9 Ear Organ Refactor + Deafness is a status effect (#21405)
* begone ear_damage

* pt 2

* this time actually begone

* ears no longer passively heal over time

* ears can die

* deafness is now a status effect

* Oh yeah ticks are every two seconds
2023-07-07 13:54:27 +01:00
DGamerL
887a5111df Adds confetti shot (#21462)
* CONFETTI CANNON

* proc and contra review

* sprite names

* nukie uplink and lewcc suggestions

* chemical fixed

* fixes party drums cost and chem explosion sound

* Henri review

* renames a datum because I copypasted shit

* changes a name because I copy pasted

* removes an extra space

* things I forgot + bundles + recipe change

* Oopsie + tones down the volume of confetti
2023-07-07 13:44:55 +01:00
matttheficus
4317881bcc Adds Hydrocodone to the Syndi Med Duffel (#21472)
* fix time

* a slight reduction
2023-07-07 13:41:26 +01:00
DGamerL
765c419feb Buffs Nanocalcium (#21476)
* The buffs

* snowball review

* Farie Review
2023-07-07 13:40:59 +01:00
Alantodne
193b276136 The Mediborgs can now evil chem (#21401)
* The Mediborgs can now evil chem

* Updated Icons because I forgor

* made a new aibots dmi for the panc icon

* Removes Pancu, sarin, and perf. adds Tirizene

* Adds S34nw's suggestion

* removed extra space
2023-07-01 10:41:03 +02:00
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