Commit Graph
59414 Commits
Author SHA1 Message Date
MigratingcocofruitandGitHub 49599aa2f6 more healing reagent no longer means less healing (#25785)
The first 20 units now do the normal touch reaction with the rest splashing instead of it being done only for 20 units and below
2024-07-01 02:16:21 +00:00
340d8a3731 Update to restraints (#25831)
* Update carbon_procs.dm

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

* Update items.dm

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

* Update handcuffs.dm

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

* Update humanoid.dm

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

* Update human_mob.dm

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

* Update status_effects.dm

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

* Update neutral.dm

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

* Update blood_magic.dm

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

* Update abduction_gear.dm

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

* Update items.dm

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

* Update abduction_gear.dm

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

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/game/objects/items.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/game/gamemodes/cult/blood_magic.dm

Woops.

Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update items.dm

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

* Update handcuffs.dm

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

* Update handcuffs.dm

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

* Update handcuffs.dm

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

* Update handcuffs.dm

The consequences of my actions

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

* Update humanoid.dm

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

* Update carbon_procs.dm

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

* Update clothing.dm

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

* Update human_mob.dm

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

* Update code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update carbon_procs.dm

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

* Update handcuffs.dm

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

---------

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-07-01 02:14:52 +00:00
ZackandGitHub 82d3a22167 Update boxstation.dmm (#26055) 2024-07-01 02:09:41 +00:00
2bd05d0103 cables again (#25968)
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-07-01 01:36:00 +00:00
DGamerLandGitHub 6f0f9a2e9c Various fixes for xenomorph logging (#26006)
* Various fixes for biohazard logging

* Better ways of counting xenos
2024-07-01 01:35:33 +00:00
DGamerLandGitHub 19cbfb129a Makes our time defines use strict numbers instead of nested defines (#26069)
* ITS LITERALLY FREE PERFORMANCE

* I CAN DO BASIC MATH I PROMISE
2024-06-30 16:30:17 +00:00
HazelandGitHub ed493d65e8 Tweaks Box's Medbay MULE dropoff point (#26026) 2024-06-30 15:42:31 +00:00
CRUNCHandGitHub 39000c7b0c Update diona_organs.dm (#26004) 2024-06-29 18:38:51 +00:00
ZackandGitHub d8b47db50e OCD cables reasons (#25970) 2024-06-29 18:32:09 +00:00
ZackandGitHub 3f6966264c Fixes HOP open door button does not open 90% of the doors on the bridge on box station (#26000)
* damn hop door button

* shit missed two doors
2024-06-29 18:30:17 +00:00
9ea58e1e33 Cult magic attacks and attacks on stun mark can now be blocked by shields (#25771)
* cult attacks and hands blocked by shields

* logic fix attempt 1

* old shit

* Update code/game/gamemodes/cult/blood_magic.dm

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

* Update code/game/gamemodes/cult/cult_items.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: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-06-29 18:28:26 +00:00
Hayden RedactedandGitHub 42d209613c Adds a Waste and Distribution Monitor to DeltaStation (#25955)
* Update deltastation.dmm

* Add files via upload

* Fixed the config file by moving it to where it should be

* Deleted config/config.toml
2024-06-29 18:23:13 +00:00
Mikhail DzianishchytsandGitHub c129ac3076 Edit max line length (#25071)
* Edit max line length

* oh god

* ts also

* rebuild tgui

* Format again after conflicts resolving

* Me rebuild tgui

* this is minified

* this is removed

* rebuild tgui
2024-06-29 18:17:26 +00:00
DGamerLandGitHub 1b56455861 Lowers grenade throwspeed (#25921) 2024-06-29 18:15:17 +00:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1ee77a0f10 Bump ws from 8.16.0 to 8.17.1 in /tgui (#25963)
Bumps [ws](https://github.com/websockets/ws) from 8.16.0 to 8.17.1.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/8.16.0...8.17.1)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-29 18:14:00 +00:00
Lime-7andGitHub 691314b5b0 Giving Pancuronium a recipe, now from different branch (#25936)
* Giving Pancuronium a recipe, second attempt

Signed-off-by: Lime-7 <142225267+Lime-7@users.noreply.github.com>

* Replaces sulfonal with bromine in recipe

its makes it easier to make and more logical, because its full name “Pancuronium Bromide” 

Signed-off-by: Lime-7 <142225267+Lime-7@users.noreply.github.com>

---------

Signed-off-by: Lime-7 <142225267+Lime-7@users.noreply.github.com>
2024-06-29 18:07:22 +00:00
DGamerLandGitHub b4bac5d681 Holoparasites are now discountable (#25943)
* Discount the parasite!

* Fix testing values

* More testing values gone

* Carp scroll not discountable again
2024-06-29 18:06:48 +00:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
bc8d56789e Bump braces from 3.0.2 to 3.0.3 in /tgui (#25939)
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-06-29 18:05:40 +00:00
chuga-gitandGitHub aba3c743f6 updates GetIdFromArguments so that it works (#25972) 2024-06-29 18:01:28 +00:00
PedroandGitHub 68635765b2 Adds a healthhud and securityhud to Captain's garment and crew monitor to Blueshield's locker. (#25982) 2024-06-29 18:00:25 +00:00
TaurturaandGitHub 1e1b711be5 More medkits ! With the correct branch this time! (#25985)
* tactical medkit craft

* machine and aquatic kit from plastic

* adds fake tactical kit

* change recipe to make the fake tactical kit
2024-06-29 17:59:35 +00:00
ContrabangandGitHub bd8c428ee6 fuck why even fuck you (#25874) 2024-06-29 17:55:31 +00:00
32b73150ef Fix stale bot (#25904)
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
2024-06-29 17:54:50 +00:00
c3f0694bad Drask Traitor Item - Cryoregenerative Enhancer (#25885)
* Drask Traitor Item - Cryoregenerative Enhancer

* Removed extraneous list

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Better Math

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

* Excessive spacing

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

* Comment fix

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

* Cleaner dna logic

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

* Better lore

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Better readability on checks

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

* More noticable alert if empty.

Co-authored-by: CRUNCH <143041327+Fordoxia@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: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-29 17:54:39 +00:00
CRUNCHandGitHub 29eb7efaa4 Wall Rechargers Cannot be Unwrenched. (#25793)
* Update recharger.dm

* Update recharger.dm
2024-06-29 17:37:36 +00:00
McRamonandGitHub b727162ed9 SMES resprite (#26041)
* sprites, hopefully i dont need anything else here

* overlay position fix
2024-06-29 17:33:15 +00:00
S34NandGitHub ec7a0bf431 Feature Freeze announcement
Feature Freeze announcement

Signed-off-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-06-29 16:31:50 +01:00
f1df68f210 Adds the Dorian Casino, a new space ruin. (#25800)
* Add the Dorian Casino, a new space ruin.

* fix maplint issues

* add area to walls missing it

* Update code/modules/awaymissions/mob_spawn.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* just plating under foyer windows

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-06-29 08:41:33 +00:00
79cd6f06c5 NanoMap Auto-Update (Sat Jun 29 01:15:59 UTC 2024) (#26081)
Co-authored-by: NanoMap Generation <action@github.com>
2024-06-29 02:43:58 +00:00
DGamerLandGitHub c12d0346a1 aaaaaa (#26080) 2024-06-29 01:59:20 +00:00
Spaghetti-bitandGitHub fc7bc29245 Adds the sec great coat. Does not include kidan as mcramon plans to remove their shoulder pads. (#26071) 2024-06-28 22:17:47 +00:00
bfb9e8c132 Refactors Foam (#25436)
* foam starts

* foam fixes

* foam foam foam

* remove widefoam, get cleaning grenades working as they should

* sirryan reeview

* Apply suggestions from code review

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

* Apply suggestions from code review

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

* locs good to me

* dgamer review

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-28 20:39:26 +00:00
DGamerLandGitHub efd6f2dfa6 Removes all locate() calls in block() (#25772)
* Removes all `locate()` calls in `block()`

* Maybe actually push fixes

* Revert bad merge master

* Forgot this one

* Maybe actually push fixes

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-28 20:33:38 +00:00
HazelandGitHub 02759bcb31 Replaces a couple rogue tiles on Delta (Kerberos) (#26056)
* Fixes my oopsie

* I fucked up 2 electric boogaloo
2024-06-28 20:12:16 +00:00
MigratingcocofruitandGitHub 6db06b1eb8 Plant DNA Manipulator update (#25370)
* WIP

* changes

* more changes

* chnges

* update

* changes

* I suck at TGUI if you see this please help

* UI a bit better still figuring it out

* More things

* Eject Select, Select empty and autoselect empty implemented. can insert replaace stat/all stats from disk list

* Ready to make a PR

Disks can be loaded into the machine from boxed, an empty disk is automatically selected once an extraction is performed if one is available. All insert and replace buttons moved to the disk lists. Window size and scaling changed to fit LSD properly without wrapping.

* minor ui tweak, fixes core stat disk being auto selected unintentionally. Loading via box now makes a sound.

* rebuild TGUI

* rebuild tgui

* implemented RO button/indicator in UI, Added null checks for can_add

* slightly shrink some buttons rebuild TGUI

* Rebuild TGUI

* use istype for type checks

* removes the disk compartmentalizer from maps

* removes Disk Compartmentalizer

* actually removes the disk compartmentalizer

* rebuild tgui and remove all remaining disk compartmentalizer sprites

* fixes a message being output to world instead of the user

* auto doc and readability improvements.

* some fixes

adjusts display name to display the new doubled percentages. Stored seed no longer counts as a disk for the purpose of reaching the disk capacity.

* Rebuild TGUI
2024-06-28 18:57:32 +00:00
chuga-gitandGitHub a423a008e8 Refactors preparePixelProjectile (#25567)
* preparePixelProjectile now just takes a target and source atom as parameters

* remove commented out code

* ahem

* hopefully fixes null target nonsense in colossus

* those who cannot remember the past are condemned to repeat It

* i just woke up in a cold sweat at 5am in realization

* reverts back to client-view based firing if source is a mob
2024-06-28 18:12:42 +00:00
Spaghetti-bitandGitHub 4f3f845e16 Fixes IPCs being invisible! (#26073) 2024-06-28 07:21:41 +00:00
f9288b194c Antagbanned people can join the ghost bar (#25869)
* Antagbanned people can be a ghost

* Update code/modules/awaymissions/mob_spawn.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@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: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
2024-06-28 03:36:07 +00:00
warriorstar-orionandGitHub c844c3ae06 mapping: create directional helpers for fire alarms. (#25897)
* mapping: create directional helpers for fire alarms.

* set PR number
2024-06-28 03:33:49 +00:00
cd4f3c4eb9 Adds hydroponic HUD implant (#25948)
* Created hydroponic HUD implant

Created a hydroponic HUD implant to match the medical, security, diagnostic, and janitorial implants.

* Update code/modules/research/designs/medical_designs.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: William Anderson <williamharrisanderson@gmail.com>

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

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

---------

Signed-off-by: William Anderson <williamharrisanderson@gmail.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-28 03:24:33 +00:00
datloandGitHub 149f7ca6ea Adds Tarot to the Chaos Staff (#25918)
* Add tarot packs and decks to chaos staff gifts

* woopsy

* adds forced tarot card

* woopsy daisy

* bruh

* add mind check
2024-06-28 03:19:59 +00:00
1080pCatandGitHub a318395a7c removes abortions.oog (#25854) 2024-06-28 03:18:05 +00:00
43b7fa5ed9 Gargantua Blood Rush now removes bolas (#25989)
* gargantua bloodrush now clears legcuffs, slightly refactors removing restraints

* comment tweaks, prevents blood rush from being used when buckled.

* Update code/modules/mob/living/carbon/carbon_procs.dm

Co-authored-by: Contrabang <91113370+Contrabang@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>
2024-06-28 03:16:55 +00:00
CRUNCHandGitHub ac50079e5f Adds a New Tip About CPR (#25977)
* Update tips.txt

* Update tips.txt
2024-06-28 03:16:52 +00:00
BiancaWilksonandGitHub f04b513dd7 Brains can ghost (#26003) 2024-06-28 03:16:49 +00:00
PedroandGitHub 9a851addbf Pandemic no longer shows heart failure/shock (#25992)
* Critical/Shock now invisible to pandemic!

* Moved visibility flag to datum
2024-06-28 03:16:45 +00:00
CRUNCHandGitHub add100e4d5 Expands the Cigarette Vendor Inventory (#25925)
* Cig Shopping Enhancement

* Yes

* I missed one.

Didn't realise that these cigs do actually spawn in maints and are thus in the game.
2024-06-28 03:16:42 +00:00
882deeff51 Make magic disguises easier to break, reworks its spell cast (#25929)
* Make magic disguise easier to break

* add hitby

* add signal check

* update comment

* Fix check and update spell description

* Apply suggestions from code review

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

* added signal to atom

* Revert "added signal to atom"

This reverts commit 79e2aa68d8.

* Update code/datums/spells/disguise_self.dm

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: datlo <quentinkoyote@gmail.com>

* adress review, add spin casting

* linter fix

* actually fix linters

* i am so dumb

* fix typo

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

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

---------

Signed-off-by: datlo <quentinkoyote@gmail.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-28 03:16:39 +00:00
bb2e96792b Tweaks the Light Replacer (#25932)
* Light Replacer Enhancement

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update

* Update lightreplacer.dm

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

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-28 03:16:37 +00:00
CRUNCHandGitHub 62a7d79358 Update cigs.dm (#25842) 2024-06-28 03:16:32 +00:00