Commit Graph

27 Commits

Author SHA1 Message Date
BiancaWilkson 074da2b796 Datumizes microbatteries (#26900)
* Datumize microbattery

* comments + feedback when you're revivable

* More comment

* more datumization

* Explaining myself

* Being able to charge while not having a microbattery

* Better comment

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

* Changes proc name to be more accurate

---------

Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
2024-10-18 23:30:04 +00:00
Sean 73e861b7c0 Dev team chat (#26669)
* dev team chat initial

* oops

* refactor who code

* allow discord relay

* yeet some un-needed stuff

* tweak the role colour

* Update code/__DEFINES/admin_defines.dm

Co-authored-by: ROdenFL <ROdenFL@yandex.ru>
Signed-off-by:  Sean <12197162+S34NW@users.noreply.github.com>

* .Add to +=

* Update config/example/config.toml

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by:  Sean <12197162+S34NW@users.noreply.github.com>

---------

Signed-off-by: Sean <12197162+S34NW@users.noreply.github.com>
Co-authored-by: ROdenFL <ROdenFL@yandex.ru>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2024-09-03 16:49:45 +00:00
Spaghetti-bit f0cef57c17 Nian Caterpillar Infestation and Worme Invasion (#25560)
* I hate DMI merge conflicts.

* Attempt at full merge conflict resolution

* Ticked >:C

* Moves the include because

* Fixes missing proc.

* 🫃

* Readds the worme cubes to all places the other bunches are. As well as changes the xenobiology console to spit out the type of monkey/primitive form that the monkey recycler is set to.

* Adds changes requested by DGamerL

* Replaces space indents with tabs. Error caused by copy pasting.

* Update code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm

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

* Uniforms the tab spacing.

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>

* Adds requested changes from @lewcc

* Removes so missed #undef in `monkey.dm`

---------

Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-22 18:20:27 +00:00
Qwertytoforty f105159acb Ports the scope component from TG and new scope eyes (#24288)
* Ports the scope component from TG.

* scope eyes

* now in scope

* fixes lwap canceling other scopes

* Update code/datums/components/scope.dm

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>

* c-c-c-changes

* Apply suggestions from code review

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

* Update scope.dm

* moves it off the gun

* Update code/datums/components/scope.dm

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

* fixes stealth conflict

* do_after_once

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-05-14 09:26:04 +00:00
DGamerL 55ed33a253 Changes incorporeal_move to defines (#25319)
* Changes incorporeal_mvoe to defines

* Lets the switch use defines too
2024-05-01 23:23:03 +00:00
larentoun 80438de316 Remove automatedannouncer mob (#24727)
* remove automated announcer mob

* remove list(z) from autosay

* typo

* remove more of unused role args

* missed passing a value...

* move comment

* better check

* better check

* comment for say_understands

* Update code/modules/mob/living/brain/living_brain.dm

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>

---------

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
2024-04-22 20:46:20 +00:00
Contrabang 744d9c6bed Ports and Adapts TGUI strip panel from TG (#24618)
* part 1

* these also

* fuckin nuke it

* more

* more stuff

* more crap

* wow

* holy fucking shit, it works

* thats a start

* oops

* fubing bundle

* hahah brrrrr

* I LITERALLY ADDED IT BACK, FUCK OFF GIT

* yeah more changes

* hide abstract

* blamo

* thats enough for today

* old code begone

* goodbye can_strip

* nearly there

* finally

* fuckin finally

* review

* tgui

* unbreak shit

* fix OD

* okay, that should fix the last thing

* remove hover on nodrop, fix early interacting
2024-04-08 21:40:11 +00:00
DGamerL de1229b947 Removes various helpers that can be simplified in a single variable check (#24551)
* Removes the first weird helper

* Removes get_turf_or_move

* Slightly alters the sharp weapon proc

* Adds nullcheck to adjustBruteLossByPart

* Changes `is_dead`

* Adds `hasorgans` to the replaced list

* Update code/__HELPERS/unsorted.dm

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>

* Contra review

---------

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
2024-03-25 01:31:56 +00:00
DGamerL 6cd2813150 Makes the isorgan() define more sane (#24738)
* Makes this define a bit more sane

* Why is this a proc!!!!

* Underscores

* Combines two uses into one define

* Contra review
2024-03-23 17:16:29 +00:00
Charlie Nolan a5aa7d923b Retaliate mobs no longer break stuff after revived with a laz injector. (#24665) 2024-03-18 18:25:35 +00:00
Contrabang e32544e599 #undef is now required for all file defines (#24091)
* CI

* undef

* hooooly crap

* yeah

* false by default

* fixes

* alright, there we go

* oops lmao

* lol, lmao even

* proper programming

* fix

* losin my mind

* oops

* yeah coloring

* WE LOVE MULTIPLE DEFINES (ive lost my sanity)
2024-03-11 14:03:30 -04:00
Adrer 01226e123a Makes all bitflags use bitshifting (#24179)
* Makes all bitflags use bitshifting

* Update contributing.md

* Updated spacing

* Defunct

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2024-03-10 17:51:42 +00:00
DGamerL 79a7558df7 Revives Organ Datumization (#23397)
* first runthrough lol

* okay make this shit actually work

* nerfs slime people

* fixes

* more changes

* fix

* bim bim bam bam

* ok back in the head becuz i dont give a shit

* Sirryan review

* Sirryan review

* Fixes CI

* Stealthy CI fail

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-01-21 22:23:51 +00:00
Octus e91dce3ee7 TG Double Examine (#23477)
* nice

* Apply suggestions from code review

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

* Update mod_control.dm

* fixes and modsuit fix

* Apply suggestions from code review

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

* think i did it right

* Apply suggestions from code review

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

* Update code/__DEFINES/mob_defines.dm

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

* Update atoms.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-01-06 22:30:38 +00:00
dearmochi aaafb6be77 Adds alert to direction locking, minor refactor (#23445)
* Adds alert to direction locking, minor refactor

* use return
2023-12-11 17:05:12 +00:00
Luc 5d5f83d791 Lobotomizes the brain from /mob/living/carbon (#23320)
* find and replace. this causes zero errors.

* there was one error

* repathing

* minor emote repathing as well
2023-11-29 18:39:43 +00:00
DGamerL 9bab795342 Yeet this shit (#22790) 2023-10-12 17:25:54 +01:00
Luc e757638648 Kills Check Pulse (#22501)
* unchecks verbs

* removes method
2023-10-01 11:41:39 +01:00
HMBGERDO 0b92d0728c Fixing examining logic (#22180)
* fixing examining logic

* new glob proc, god this looks much better

* this looks much better

* dont need this

* if they're missing arm, we know they're missing hand
2023-09-17 18:26:11 +01:00
DGamerL 6144baf737 Adds a new ability to the Gargantua subclass: Desecrated Duel; alongside a small buff (#21858)
* let the wall of errors begin

* alright that's enough for today

* more pain

* only 7 errors

* arena :)

* smaller arena

* slight cleanups

* okay we ask charlie for help tomorrow

* leap works

* okay we ball

* idk I'm just adding this for now

* WE HAVE A CIRCLEEE

* Charge back + timer!

* first steps of the buff

* more cleaning up

* Buff is progressing nicely, almost done

* OKAY WE BALL

* Whoops last things

* whoopsie forgot this

* 20 Stamina damage

* 150 blood now

* WE GOT ANIMATE IN THIS HOUSE

* we be impact immune now

* IT DOESN'T LOOK LIKE SHIT (and goes through walls)

* ok ship it

* Consistency

* I'm buying charlie a bottle of asda rum

* Okay, ready for review

* Henri + Hal reviews

* More reviews + I am stupid

* Charlie review

* Ohhhh so that's why it didn't work

* Yeet this

* Charlie review

* Comment

* Charlie review kinda

* Hal review

* DESECRATED DUEL WOHOOO

* Oops I changed this

* That's one thing done

* Lewc review

* Lewc review part 2

* Update code/__HELPERS/trait_helpers.dm

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

* Lewc review + ICON WOOO

* Aaaaaaa

* TGUI FIXED

* Henri review

* Charlie review

* Charlie review

* Henri review

* Jimkil review

* Update code/__HELPERS/game.dm

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

* Charlie review

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-13 16:48:14 +01:00
Octus 912d444d07 Removes Vox... Armalis, yes the other vox we forgot about (#21519)
* youtube 2008 die sound effect

* I take pride in my work

* noisecannonsbegone

* armalis clothing shit
2023-07-23 20:14:27 +01:00
GDN ff41b0b109 improves clarification on having martial arts as a non carbon (#21189)
* improves clarification on having martial arts as a non carbon

* worked in testing

* xenomicrobes
2023-06-14 21:18:24 +01:00
GDN 4621a8a05f morphs now show up the orbit menu antagonist section (#21145)
* morphs now show up on antaghud

* ismorph changes
2023-06-02 19:57:17 +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
Henri215 764aed10c5 Adds custom age limits to each species (#20878)
* Custom min/max ages for species

* fixing the pitch

* tweaking AGE_MAX

* Revert "tweaking AGE_MAX"

This reverts commit 0270ba6840.

* max_age decreased roughly by 10%

* Update code/__DEFINES/mob_defines.dm

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

* machine minimum age

* clamp

* Adjustments to ages

* age max

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

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

* clamp and age pitch tweaks

* finally found plasmaman lifespan1

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-22 22:04:42 +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
AffectedArc07 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