Commit Graph
71 Commits
Author SHA1 Message Date
Nathan WintersandGitHub da34941fae Minor pill/patch application refactor (#23958)
* Refactor pill/patch application

* I will come back to this
2024-03-01 11:39:25 +00:00
Nathan WintersandGitHub 69da720b20 Fixes pills and patches displaying a fake transfer rate (#23539)
* Fix patches not preserving chem temperature

* Remove some leftover same-as-parent property assignments from pills

* Fix pills/patches showing their nonexistent transfer rate

* Revert "Fix patches not preserving chem temperature"

This reverts commit 8905280613.
2023-12-16 16:15:47 +00:00
307120e7d3 Patches and pills are now no longer subtypes of food (#23063)
* Part 2 - feeding others doesn't work as intended

* Part 3: fixing force feeding

* Fixes patches being wack

* Makes this less ass

* Adds patches to the chemistry bag

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

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

* Some missed patches

* Apply suggestions from code review

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

* Fixes IPC logic

* Henri Review

* Add updatepaths

* Jimkil review

* IPCs now aren't allowed to eat pills and get patch

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

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

* Update code/modules/reagents/reagent_containers/patch.dm

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

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-11-21 15:37:16 +00:00
HMBGERDOandGitHub 42c762ccd2 Using medicine on yourself on activate (#21955)
* now you can use patches, pills, injectors

* more supported meds

* apply proc
2023-09-01 23:02:34 +01:00
ContrabangandGitHub 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
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
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
Nathan WintersandGitHub ed39233fe0 Check target fullness before tranfering pill contents (#19321) 2022-10-10 21:24:17 +02:00
AdriandGitHub 9c1618139b Tweaks some NanoMed Plus products, tweaks mannitol and mutadone pills, renames healing patch (#18904)
* Changes mannitol and mutadone pills

* Renames healing patch to brute patch

* Removes some NanoMed Plus products

* Moves insulin to contraband

* Removes unnecessary capitalization when it comes to reagent bottles

* Reverts mannitol sprite change

* Moves health analyzer upgrades from Nanomed plus to wall nanomed premium category

* Makes syringes lowercase

* Revert "Moves health analyzer upgrades from Nanomed plus to wall nanomed premium category"

This reverts commit 3d586665fe.

* Renames prespawned advanced analyzers
2022-08-29 11:10:16 +01:00
Nathan WintersandGitHub bec7ebec25 Fix pills checking DRAINABLE on target reagent container (#18657) 2022-08-03 15:34:20 +01:00
2b815dc11c Pill refactor and bug fixing (#15274)
* Removes spawn() when dissolve pill in reagent container

Also fixes some messages

* General pill refactor

Fix exploit allowing injection of reagents into pills
New() -> Initialize()
Third-person message upon dissolving pill no longer displays to the user, mimicking visible_message
Make all pill names improper, with the chemical capitalized
Fixes grammar in Haloperidol pill

* Update code/modules/reagents/reagent_containers/pill.dm

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

* Remove liquid requirement

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-02-21 21:42:23 +00:00
SteelSlayer d928635393 Some spawn removals and other assorted code cleanup 2020-08-07 08:55:34 -05:00
AffectedArc07andGitHub 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
variableundefined eeb86a0d2f Stage 1 Functional Code Only 2019-07-30 20:38:03 +08:00
Mark van Alphen 0971a45fbd Fix capitalization 2019-06-03 01:53:39 +02:00
Mark van Alphen 697bb8eee5 More Lavaland fixes:
- Air alarm computers will no longer display alarms that can't be remote controlled
- Survival capsules now have a NanoMed
- Fixed the disk compartmentalizer not having a sprite when something is put in
- Fixed the drying rack not having a sprite when something is put in
- Turned water bottles into glass containers so they have more functionality
- Hairless hide can now be made wet using water
- Reagents in glass containers can now be fed to others
2019-06-02 23:29:50 +02:00
Mark van Alphen a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
2019-04-04 22:04:55 +02:00
Fox McCloud 6fadf083d7 OHHHH SHITTTT ANTTTSSS 2019-04-01 01:27:49 -04:00
Mark van Alphen 1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Fox McCloud d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Fox McCloud d61bbe807d [Goonchem] Pills, Bottles, Patches, and Pillbottles 2019-03-17 21:30:10 -04:00
datlo 244fcfc739 capu/capu+ fake death for realsies, add fake death pills to syndis/maint 2019-01-02 09:46:03 +00:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Birdtalon 904131be1e some more toys for psyche 2018-02-23 13:48:08 +00:00
FreeStylaLT ebb44a45d2 adds a toxic pill sprite, makes the toxin and cyanide pills use it 2017-12-27 20:42:55 +02:00
FlattestGuitar 086327ef65 Can't taste pills and patches 2017-06-14 18:39:08 +02:00
Fox-McCloud 4b81269adc reagents 2016-10-25 04:14:39 -04:00
Fox-McCloud 517f294beb more tweaks 2016-07-19 23:09:34 -04:00
Fox-McCloud a4619fbd38 clean up 2016-07-16 23:11:32 -04:00
tigercat2000andFox McCloud 732c3b4ae5 Goonchat (#4744)
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
2016-06-23 16:56:15 -04:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
VampyrBytes 1148bde3a6 eating refactor (#3733) + bugfixes
Ok, messed up resolving the merge conflicts (first try), so doing a
fresh pr. This turned out to be a good thing, as after I put the changes
back I tested again, and found 2 bugs (not due to my code)

Firstly, the organ refactor had introduced a bug when taking liver
damage from being drunk. It wasn't getting the liver correctly, leaving
it with null, and was then trying to damage it.

The second was related to the amount you took in when drinking
2016-03-05 08:03:39 +00:00
Fox-McCloud 71001cc5ea Changes a Chemistry Transfer Proc 2015-09-22 05:56:49 -04:00
Fox-McCloud 47d14c3b7e Chemistry: Patch Balance 2015-09-18 22:33:40 -04:00
Markolie 8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace
Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm
2015-08-18 18:38:59 +02:00
Markolie 5eee617063 Consolidate ?/FLW links under key_name_admin 2015-08-17 00:13:53 +02:00
Markolie a397c730b5 Admin jump overhaul, add watchlist functionality, other admin updates 2015-08-16 23:28:02 +02:00
Markolie e6408b96c2 IPC overhaul 2015-08-15 23:52:26 +02:00
Markolie 08f67c7881 Smartfridge update 2015-08-01 00:18:00 +02:00
FalseIncarnate 39305b1a86 Food/Pill Fixes
Fixes Food and Pills so that they actually transfer their reagents
properly
- Big thanks to Krausus for helping with locating and correcting the
issue

Fixes IPCs being able to eat pills.
- They have a monitor for a head, where do you think you're going to put
that?

Fixes IPCs being immune to the soothing effects of water
- IPCs that are on fire can be properly doused with a splashing of
water.
2015-06-30 09:27:06 -04:00
Tigercat2000 29c59bd51b Add check for antags in msg_admin_attack
This commit first adds a new helper proc labeled isAntag(), as well as
adding a check for antags for every instance of msg_admin_attack().

Goals of this commit:
 - Make admin ATTACK: logs indicate if attacker is an antagonist.

Note; High probability of merge conflicts, 47 files changed.
2015-04-12 08:41:53 -07:00
Fox-McCloud a40ee14f2c Forgot 2015-03-27 07:19:13 -04:00
Fox-McCloud d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Fox-McCloud 3e1fac8c94 [Goonchem] FirstAid Transitions 2015-03-25 08:45:36 -04:00
Fox-McCloud b30d3f795f Goonchem Map Changes 2015-03-24 22:48:25 -04:00
Iamgoofball d091031ca6 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into muh_doctors_delight
Conflicts:
	code/modules/reagents/Chemistry-Machinery.dm
2015-03-24 18:03:11 -07:00
Iamgoofball 20afecd650 help this guy died of styptic pills worst coder 2015 2015-03-24 13:02:09 -07:00
DZD fbd9c367c0 NODROP flag addition & handling
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
Markolie dd70ba2030 Adds a psychiatrist's locker to the psychiatrist's locker, with a straight jacket, syringe and a pill bottle with 2x Citalopram and 2x Methylphenidate 2014-11-22 20:58:26 +01:00