Commit Graph
44579 Commits
Author SHA1 Message Date
datloandGitHub 57e58943ea Add sleepy pens to syndi research base (#25907) 2024-06-22 22:45:24 +00:00
b737bbd28b Processing_unit is no longer dense - Fixes #25966 (#25986)
* Processing_unit is no longer dense - Fixes #25966

* Changed density on definition

* Removes var edit, oops

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>

---------

Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-06-22 22:45:21 +00:00
c1e00b906d Fixes Headset Sprites (#25979)
* Update misc_defines.dm

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

* Update human_update_icons.dm

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

* Update code/modules/mob/living/carbon/human/human_update_icons.dm

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

---------

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-06-22 22:45:17 +00:00
chuga-gitandGitHub eb8e00a01b Fixes wizard blind spell lasting forever (#25964)
* makes blind not a genetic spell

* pushes blind duration to 30 seconds (from 20), blurry duration to 40 seconds (from 30), reverts back to 1 tile click targeting.
2024-06-22 22:45:13 +00:00
QwertytofortyandGitHub e37c342401 Lowers the universal gun kit to stechkin pricing (#25961) 2024-06-22 22:45:09 +00:00
c3c5d890f9 CQC Slapper is now NODROP (#25951)
* parry slapper is now nodrop

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

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

* better signal handling

* comment

* DATUM

* fixing signal proc ref

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

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

---------

Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-06-22 22:45:03 +00:00
KanoandGitHub 4456273fb3 no more lies (#25944) 2024-06-22 22:43:36 +00:00
1080pCatandGitHub 13c052eb2b Fixes the power biochip mentioning power gloves (#25916)
* Update click_override.dm

* also a comment

* gramor

* guh
2024-06-22 22:43:22 +00:00
TaurturaandGitHub 068a9658b8 Kinetic crusher description fix (#25909)
* fixes abductor toolset and surgical implants

* no more visual overload

* DGamer's review + fix contraction
2024-06-22 22:43:14 +00:00
Spaghetti-bitandGitHub a7d1610255 [HOTFIX] Nianworme inhand / UI sprite fix (#26009)
* Should fix the missing hand sprite for caterpillars.

* Adjusts a comment.
2024-06-22 22:43:09 +00:00
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
QwertytofortyandGitHub 2645a94fd4 Ah. Separate checks on robotics.dm I see. (#25998) 2024-06-21 13:46:54 -05:00
DGamerLandGitHub 0b3c35fbc2 aaaaaa why are you like this contortionists (#25993) 2024-06-21 10:48:20 -05:00
warriorstar-orionandGitHub 5f2b7d7cd0 refactor: remove many unused areas. (#25893)
* refactor: remove many unused areas.

* correct pod number
2024-06-20 11:38:33 +00:00
QwertytofortyandGitHub c7d6e83d7e fixes block uptime being 33% instead of 50% (#25917)
* matt I'm shooting you (not really but)

* also these ones

* fixes cqc
2024-06-20 11:38:30 +00:00
1080pCatandGitHub faab99d45b i ded pls nerf (#25888) 2024-06-20 11:38:27 +00:00
18b0b09778 adds spawners for NPC zombies (#25873)
* lmao

* lol

* yes

* yeah sure

* fix

* Apply suggestions from code review

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

* lewc review + duplicate

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
2024-06-20 11:38:23 +00:00
PopeDaveThe3thandGitHub 2ef31cc6e4 spikethrower price decrease (#25872) 2024-06-20 11:38:20 +00:00
c4ba087400 Unwrenching a pressurized pipe you're standing on now flings you in a random direction (#25878)
* Random Direction Go!

* Better Directions

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

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-06-20 11:38:18 +00:00
QwertytofortyandGitHub 489f4ae85c no patrick you have to put effort in (#25973) 2024-06-19 15:49:26 +00:00
QwertytofortyandGitHub 7acefde47d One use only please (#25967) 2024-06-18 23:52:05 +00:00
QwertytofortyandGitHub 2b4dc429f2 talk about killing mah self (#25962) 2024-06-18 20:32:01 +00:00
fa578375db REOPEN. Adds nanotrasen pin, pride pins and pride undershirts. (#25833)
* be whoo you areee for your prideeeee. don't hideee

* nanotrasen pride nationwide

* Update code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-18 00:14:24 +00:00
QwertytofortyandGitHub d47bf69d77 fixes catwalk recursion (#25941) 2024-06-17 02:00:43 +00:00
QwertytofortyandGitHub 8173e1695d removes flick from spark effects (#25898) 2024-06-17 01:54:54 +00:00
d12eaadcc4 Actually fixes account_name runtime in rename_character (#25880)
* this is why you test things

* Update code/modules/mob/mob_misc_procs.dm

Co-authored-by: Ryan <80364400+Sirryan2002@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: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-06-16 12:18:52 +00:00
984672c209 Fixes a kudzu runtime (#25911)
* Fixes a runtime and also makes it (very slightly) less dumb

* Update code/modules/events/spacevine.dm

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

* Update code/modules/events/spacevine.dm

Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-16 12:17:47 +00:00
QwertytofortyandGitHub 9ddfe201af blood drunk is no longer comically afraid of lava (#25910) 2024-06-16 12:13:21 +00:00
SchrodingersWolfandGitHub 26a9468277 Changes a single number (#25926) 2024-06-15 17:04:25 +00:00
ContrabangandGitHub 2a0d1c0416 ognerwogner[0ign3we0ifnhwepighn3igbwoigbewo (#25902) 2024-06-14 19:02:44 +00:00
3bc5f8ebbe Prevent constructed AI laws from randomly becoming null. (#25913)
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
2024-06-14 05:06:11 +00:00
BiancaWilksonandGitHub 1fae459c26 Fixes gatfruit seed's description (#25912)
* Fixes #25745

* More descriptive
2024-06-14 03:25:30 +00:00
ContrabangandGitHub 439918fdcc Changelings now get an option to be revived by defibrillator when faking death (#25623)
* wow

* forgot to push

* oops

* lewc review
2024-06-12 22:09:40 +00:00
b297a543df Serving Tray Tweakery (#25759)
* Update bags.dm

* Update bags.dm

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update bags.dm

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update bags.dm

* Update bags.dm

* Update bags.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-06-12 22:07:26 +00:00
ContrabangandGitHub a7c273463d More Zombie Tweaks (#25789)
* lmao

* text fix

* lol
2024-06-12 22:02:53 +00:00
e7e340598c Fixes blob diagonal expansion (#25848)
* fixes double_expand runtime with null overmind

* Apply suggestions from code review

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

* DGL reviews

* today on git butchers applying suggestions

* Update code/modules/events/blob/theblob.dm

Co-authored-by: DGamerL <108773801+DGamerL@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>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-12 21:59:26 +00:00
b842e3909a [TM FOR THE LOVE OF GOD] Makes a bunch of random things initialise. (#25539)
* I disabled my lunacy inhibitors

* Update code/game/objects/objs.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-12 21:53:58 +00:00
3479f84437 Makes mind swapping instant (#25781)
* shhhhh

* YEAG

* you can now cast it on yourself, and it'll be whispered

* nah the sound is enough

* Update code/datums/spells/mind_transfer.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-12 21:40:03 +00:00
LucandGitHub b1909e6066 Add a sound effect for headset messages (#25755)
* Add a sound effect for headset messages

* better sound

* good better best
2024-06-12 21:39:51 +00:00
1122ca5adb Adds a verb to show mentor say history, similar to admin say history (#25749)
* adds a verb to show mentor say history, similar to admin say history

* Update code/modules/admin/player_panel.dm

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

* Update code/modules/admin/verbs/asays.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-06-12 21:39:44 +00:00
1b0aac3065 Makes high levels of infection less likely to kill you instantly (#25688)
* Make organs a little less bad

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

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

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-12 21:39:39 +00:00
QwertytofortyandGitHub bee5321b88 Humans now instantly fall asleep at -100 HP, rather than after am (up to) 2 second delay (#25723) 2024-06-12 21:39:35 +00:00
LucandGitHub 922d7215bd Adds a check on messaging admins if an item is in nullspace. (#25895)
* this sucks this sucks so bad

* unused
2024-06-12 20:17:01 +00:00
chuga-gitandGitHub 4ab93fb50e Fixes eye_color runtimes for Drask, Kidan, and Nian (#25856)
* null check for eyes

* return ternary
2024-06-12 19:19:04 +00:00
CRUNCHandGitHub 9ea4320f46 Update fancy.dm (#25721) 2024-06-12 19:18:02 +00:00
dj-34andGitHub 173ff7e7d4 Deathsquad buff (#25744) 2024-06-12 19:17:18 +00:00
chuga-gitandGitHub f4b707bdd7 fixes hitscan projectiles runtiming when reaching the edge of the map (#25853) 2024-06-12 19:15:09 +00:00
438faac253 Refactors projectile ricochets (#25764)
* same taste, twice the speed

* pulls proc/handle_ricochet() to the atom level. adds var/flags_ricochet and related defines.

* space indentation sneaks its way in yet again

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-06-12 19:08:57 +00:00
chuga-gitandGitHub 6e085f00e5 Removes ID-locking from cloning console (#25812)
* removes ID lock on cloning pod

* removes unimplemented emag_act() and cleans up the rest of the ID locking logic

* adds admin logging for cloning pod force ejection
2024-06-12 18:56:38 +00:00
4b3b64e540 [FIX] Cyborg Zipties Will Not be Consumed When Making Wired Rods (#25752)
* r o d

* Update handcuffs.dm

* Update handcuffs.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>

* Update handcuffs.dm

* Update handcuffs.dm

* Update handcuffs.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>

* Update handcuffs.dm

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

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-12 18:56:20 +00:00