Commit Graph

77 Commits

Author SHA1 Message Date
Taurtura 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
Arthri ac5a4dfe11 Add colors to pill bottles and patch packs (#25650)
* Add colors to pill bottles and patch packs

* Tweak chem master colors

* Make patch pack overlay lighter

* Deduplicate code and update colors

* Fix linter

* Move proc

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
2024-06-06 13:08:31 +00:00
DGamerL bad8b31afa Changes all .len to length() where applicable (#25174)
* Globals work

* Double access works

* All other things

* Revert "All other things"

This reverts commit 6574442eb6.

* More changes that compile and work

* IT WORKS AAAAAA

* Changes even more .len to length()

* Apply suggestions from code review

* Update code/datums/mind.dm

* Update code/__HELPERS/sorts/InsertSort.dm

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

* Update code/__HELPERS/sanitize_values.dm

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

---------

Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
2024-04-19 17:32:09 +00:00
Zack f4447fc133 Update firstaid.dm (#24302) 2024-02-27 18:28:36 -05:00
DGamerL 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
DGamerL 3693e6d620 Epi autoinjectors are now a subtype of autoinjectors, the basetype is now empty (#22261)
* removing the useless feature
Yes this removes it from all autoinjectors
No I am not going to publish this

* WOOOOO REGEX WORKS

* Almost forgot the entire reason of this PR

* Oversight

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Lewc review

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

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

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-09-17 20:15:43 -04:00
Badoniondev 5e0e175a39 Refactors inventory items code to allow to play custom sounds, adds custom sounds to pill bottles and patch packs (#21634)
* Removed dupe playsound, sound now uses var

* pill bottles now have sounds

* Patch packs also have sounds

* Increased patch packs volume by 4db

* Moved sounds to folder, added licence and credits.

* Fixed invalid sound paths
2023-07-17 10:54:57 +01:00
matttheficus fc87927f7b Tool Size Tweaks (#20586)
* The Great Toolening

* oops all belts (incoming self conflict lul)

* defines shouldnt lie

* mini crowbar TODOs

* beeeeeeeeeg crowbar

* oops it needs a design

* purple kit + vendor fix

* add mini crowbar dmi

* oops forgot this

* i am an idiot sandwhich

* im bad at code

* scratch that, i cant read my VSC

* wrench undo + readd to boxes

* nukies too

* man i cant code

* power tools should logically follow

* formatting

* maybe im free?

* forgot inhands

* Update toolbox.dm

* bluespace belt buff (unironic)

* undo for now

* fixes bluespace/tot belts + adds w_class override

* adds small crowbar to e-toolboxes and tot tools

* power tool fix

* Rnd build path

Co-authored-by: Adrer <erwin@lombok.demon.nl>

* design fix

* merge conflict + small fix

* small name fixes

---------

Co-authored-by: Adrer <erwin@lombok.demon.nl>
2023-05-02 21:43:06 +02:00
Burzah 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
Burzah 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
GDN dd47769567 combat defib tweaks, moved out of the medikit (#20379)
* moves the combat defib out of the first aid kit, tweaks both costs

* no more synthflesh patches

* i just a little stupid

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

* we just a little stupid

* deletes stims, really not needed

webedit lol

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-03-06 23:47:00 -05:00
Vi3trice fc7e4847b3 Penlights are universally pens (#19498)
* You're a pen, you're a light

* Update code/__DEFINES/is_helpers.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Might as well remove them

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-10-26 00:12:14 +01:00
Vi3trice 9e90c81282 Defining Part 1 - Code cleanup toward defines (#19262)
* This is only the beginning

* Update stack.dm
2022-10-10 20:50:29 +02:00
atteria bcf90593ed Improves belt item overlay code, Adds new belt item overlay sprites (#17568)
* belt-improvements-and-sprites

* fixes my fix of botany belt allowed contents
2022-04-12 15:57:21 +01:00
S34NW e7e4e6beb6 new lights, dupe sprite removal, APC cell clarity 2021-08-20 12:52:39 +01:00
SabreML 3ae6ef1fc2 Initialized Storage Items (#15057)
* Refactor V1

* And this too

Three commits already

* Review stuff

* hecking invisible runtimes

* Cleanup and Documentation

This part is NOT intended to be a refactor.
I just figured why not go through everything since I'm already messing with it.

* Hopefully got all of the . = ..()

Also fixed a massive bug that I somehow didn't notice.

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* for() loops

Pretty sure I got everything.
Cutoff point is 4 items.

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-02-28 21:45:24 +00:00
dearmochi cc6c6d0389 Adds ability to color patch packs in ChemMaster (#15244) 2021-01-10 20:56:37 +00:00
moxian 1683c4271a Refactors renaming things with a pen. (#14960)
* Refactors renaming things with a pen.

* Farie review (thanks!!)

* Derp.

* Farie take 2
2020-12-16 14:43:15 -05:00
SabreML 1b41b28763 Craftable donut boxes (#15051)
* Craftable donut boxes

* probably doesn't need two names
2020-12-06 10:25:33 +00:00
ZEUS\samcr 70c5d4b987 IPC First Aid Kit No Longer Has Oil 2020-10-09 14:35:44 -04:00
Fox McCloud dc6a5691fa Applicator QoL Tweaks 2020-05-04 19:15:35 -04:00
Fox McCloud faecf7cbfa Patch rework (#13062)
* Patch Rework Part 1

* applicator

* fixes

* fixes

* temperature settings

* single application patches

* additional

* new line fix

* fox  is a derp sometimes
2020-05-02 20:07:43 -04:00
AffectedArc07 210f8badf4 Makes all global variables handled by the GLOB controller (#13152)
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
2020-03-20 21:56:37 -06:00
AffectedArc07 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
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Arkatos1 de9da04572 Standardized colors, finished change wrapper choosing and modified templates and their sizes 2019-06-30 19:46:13 +02:00
Arkatos1 d33d018e62 Finished colors for other prespawned pillbottles, new colors, finished template for changing wrappers in chemmaster 2019-06-30 16:08:33 +02:00
Arkatos1 e6dca3ffa1 Colored pillbottles 2019-04-30 19:34:22 +02:00
Fox McCloud c0ca397d8a Fixess Being Unable to Open Pill Bottles 2019-04-07 09:25:45 -04:00
Fox McCloud 585dcb4355 sprite 2019-03-22 23:25:45 -04:00
Fox McCloud d61bbe807d [Goonchem] Pills, Bottles, Patches, and Pillbottles 2019-03-17 21:30:10 -04:00
datlo 42efc6aeae moved pill bottle to first aids 2019-01-03 17:13:07 +00:00
AlAtEx e6740168d9 Added machine first aid kit code 2018-11-21 18:14:40 -05:00
Superhats 9f575c6281 Update firstaid.dm 2018-07-20 13:00:50 +02:00
Superhats bf5b7e822e Re-adds advanced magboots, a bunch of implants, safety on the defib 2018-07-15 18:50:02 +02:00
Superhats 6704f2b999 yeet 2018-07-15 00:29:08 +02:00
Fox McCloud 202fbe92fb Cleans Up Medbot Code, Re-Allows Syndicate Medbot 2018-05-29 12:15:04 -04:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Ansari bfb648b1b2 Re-add combat defib to storage kit. 2017-10-13 07:26:18 +08:00
Ansari 703593b772 TC cost tweak for nukie. Tactical medkit content tweak. RSG added to nukie. Dart gun removed from nukie arsenal. 2017-10-12 21:39:47 +08:00
Sam 07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Markolie 9d9e957df1 Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold 2017-03-05 19:53:20 +01:00
Fox-McCloud 43889a89d5 Ports Mining Shelters 2016-08-21 03:14:08 -04:00
Fox-McCloud d20df994a6 Trauma and Burn Kit Rework 2016-07-23 09:36:51 -04:00
Fox-McCloud a4e7a41426 Refactors Medical Stacks 2016-07-21 12:26:21 -04:00
monster860 009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
monster860 3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Tigercat2000 71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00