Henri215 and GitHub
c4667311e7
Janitorial equipment tweaks and cleaners availability ( #20037 )
...
* Janitorial equipment tweaks and advanced cleaner
* cleaner availability tweaks
* old cleaner for drones
* Mop capacity buff
* advanced cleaner for sol traders
* conflict part 1
* Merge branch 'master' into janitorial_tweaks
* Revert "Merge branch 'master' into janitorial_tweaks"
This reverts commit 47129ea819a8c520b069
2023-02-03 13:10:51 -06:00
7c3cd86f14
APC & Machinery Refactor + Local Powernets ( #19991 )
...
* local powernet and machine power refactor
* some fixes
* more tweaks + powerchange() refactor
* fixes var edited apcs on meatpackers.dmm
* fixes issue with power channels
* Reviews
* delta fix
* Update code/game/machinery/portable_turret.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* removed area power change proc
* damn morgues
* requested changes
* request changes
* deconfliction
* mapping fixes
* some fixes from TM
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-01-30 22:28:10 +00:00
warriorstar-orion and GitHub
b790e6d5e2
Whitespace cleanup part 4. ( #20226 )
2023-01-20 19:40:42 -05:00
Luc and GitHub
9ba005de9f
Add themselves as a pronoun helper, fixes some usages of it ( #20184 )
...
* Add themselves helper
* Testing and replacing
* Fixes some non-standard usages
2023-01-20 19:28:48 -05:00
b940c1eb21
Allows clings to regenerate without a brain. ( #19856 )
...
* Move brain organ code where it belongs
* Rename too
* WIP, but hey, it kinda works now.
* Account for a few missing heads
* Remove vital check, killing the user on death
* Let defibs and scanners better deal with these
* Remove debug brains
* Clean up some more contingencies
* More head checks
* Update code/modules/antagonists/changeling/datum_changeling.dm
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
* Fixes up signal business
* some stuff from sean's review
* Add some type safety checks for heads
* oops
* Update code/game/objects/items/weapons/cosmetics.dm
get this in there too
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
* Remove decap sword
* Quick suggestions
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Addresses shedding problems
* Add new defib changes
* this is why we have CI
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2023-01-20 19:25:51 -05:00
GDN and GitHub
311cdae455
Converts some borg equipment to radial menus ( #20044 )
...
* Borg stuff radial menus; I hate borg hypos
* sneaky
* borghypo can be it's own thing
* forgot ya
* ryan's review
2023-01-20 18:59:35 -05:00
S34N and GitHub
c16481c076
removes smallhelath ( #20237 )
2023-01-19 15:36:27 -05:00
Coolrune206 and GitHub
bf4212d24a
Soap stops swearing ( #20162 )
...
* technically functional
* technically functional
* more logically coded, credit to Contra and Mira
* yes this is more logical
* Sean and Fox reviews
* webeditor heresy
2023-01-18 11:32:28 -05:00
71d7eb1de0
Removes the Speed-boost from Cling Epi OD ( #20127 )
...
* gives the wizard some more clownish options
* removes speed boost from cling Epi OD
* Revert "gives the wizard some more clownish options"
This reverts commit 938b1c8ebd89928798+lewcc@users.noreply.github.com >
* Hal9001 Review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2023-01-13 17:06:01 +01:00
Henri215 and GitHub
e711cd5921
Fixes lots of common spelling mistakes ( #20086 )
...
* Fixes common spelling errors: "atleast", "infront", "succesfully", "alot"
* recieve -> receive
* spelling mistakes: percieve, wierd, posession, seperate, succesful
* Spelling mistakes: noticable, concious, enviroment, existance, foward, interupted, independant
* tgui rebuild
* lets make this run
* "succeded" mispelling
* reverting money spam change
2023-01-08 20:12:31 -05:00
Henri215 and GitHub
515ee2671c
Tweaks to unfasten times ( #19996 )
2023-01-06 21:57:28 +01:00
AffectedArc07 and GitHub
e91b6c94f7
Renames QDEL_LIST to QDEL_LIST_CONTENTS ( #20006 )
...
* Renames QDEL_LIST to QDEL_LIST_CONTENTS
* derp
2022-12-29 14:28:40 +00:00
warriorstar-orion and GitHub
a7d09cf033
Whitespace cleanup part 2. ( #19891 )
2022-12-24 18:38:43 +01:00
warriorstar-orion and GitHub
8f8f2ec574
Move reagent documentation to dmdoc. ( #19888 )
...
* Move reagent documentation to dmdoc.
* Cleanups
2022-12-14 16:17:17 -05:00
363464801c
Ice Cream Cone Tweaks and New Sprites redux ( #19544 )
...
* Ice Cream, reagent colour, and drink colour update
* re-add accidentally removed drink
* updates for lewcc and sean's review
* a few new names and updates for lewcc's review
* adding S34N's suggestion
* fix merge comflict
* Update code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
* Update code/modules/food_and_drinks/food/foods/desserts.dm
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
* modified things as per Sirryan's review
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
2022-12-12 22:15:43 -05:00
Nathan Winters and GitHub
638d89711d
Cryocell Fixes ( #19800 )
...
* Readability & styling
* Fix cryocells not respecting mob's max health/not ignoring robotic limbs
* Only process occupant if we have power
* Fix cryocell injection cooldown being tracked improperly
* Don't kick them while they're down
* Minor cleanup
* Fix for a hacky fix
* Fix Cryoxadone sometimes using outdated cryocell temperature
* This didn't do anything
* Bitflag ops: readability+styling
2022-12-12 17:00:37 -05:00
BiancaWilkson and GitHub
df71074edc
hey look, a todo ( #19795 )
2022-11-29 14:05:48 -05:00
Farie82 and GitHub
cad01936b6
Fix blackpowder reactions ( #19709 )
2022-11-15 21:40:06 -06:00
S34N and GitHub
667dd5d4ac
515 Compatibility ( #19636 )
...
* 515 compat
* double spaces
* Callback documentation, aa review
* spacing
* NAMEOF_STATIC
* big beta
2022-11-08 23:08:40 +00:00
warriorstar-orion and GitHub
7867c51b52
Replace /proc/num2hex with a much faster macro. ( #19600 )
2022-11-06 13:11:32 +00:00
473a46ff5a
Tweaks to autolathe design costs ( #19469 )
...
* first wave of tweaks
* Update code/modules/power/cable.dm
Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com >
* Edan52 review
* missed one
Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com >
2022-10-28 20:05:46 +02:00
Vi3trice and GitHub
03ce2920e1
Defining Part 4 - Code cleanup toward defines (... and the rest) ( #19388 )
...
* I wasn't done
* nits
2022-10-28 19:28:23 +02:00
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
Charlie and GitHub
10a8e8ce85
fix ( #19455 )
2022-10-21 20:43:23 +01:00
PacifistDalek and GitHub
9aacf9fead
New pumpkinhat and blumpkin hat sprites ( #19429 )
2022-10-20 20:35:28 +01:00
AVeryReluctantSpider and GitHub
4c63715566
Update alcohol.dm ( #19417 )
2022-10-20 20:33:32 +01:00
Charlie and GitHub
45877bcfa6
fix ( #19453 )
2022-10-20 15:59:49 +01:00
Farie82 and GitHub
8386e9cdef
Fixes waterpacks and friends not GCing ( #19269 )
...
Move nozzles to Initialize
Makes reagents not hold a reference to their atom when they get destroyed
2022-10-18 22:52:35 -05:00
GDN and GitHub
e510680a20
adds blackbox logging for revival ( #19399 )
2022-10-16 12:33:41 +01:00
edeba92326
Smoke spells readability ( #19387 )
...
* read the smoke
* oops
* contra
* contra
* more tidying
* last one
* Update code/modules/projectiles/projectile/magic.dm
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2022-10-15 18:05:55 +02:00
Vi3trice and GitHub
59dfdba201
Everything else through the door ( #19358 )
2022-10-13 21:56:58 +02:00
Nathan Winters and GitHub
ed39233fe0
Check target fullness before tranfering pill contents ( #19321 )
2022-10-10 21:24:17 +02:00
Vi3trice and GitHub
20c437f7d2
linters do your magic ( #19263 )
2022-10-10 20:58:41 +02:00
Contrabang and GitHub
8418997ed8
Moves most screwdriver checks to screwdriver_act ( #19024 )
...
* screwdriver_act my beloved
* convert to returns instead of . / lewcc review
* it will be done
* i'm a little bit stupid, but now time to test
* sometimes I get excited and press the commit
* The great test has been completed
* oh wow oh wow, lewc review
* found one last one
* Steel review
* Lewc review
* quick sirryan review
* removes stupid comments (old coders I blame)
* sirryan review two
* whoops...
* hal review
* the fix to the fix to the fix
* Revert "the fix to the fix to the fix"
FUCK I pushed to the wrong branch
This reverts commit a96fe98781
2022-10-06 09:30:33 +01:00
56a5753d3d
Lets you deepfry ice ( #19200 )
...
* Allows for deepfrying ice
* formatting
* Almost forgot this
* Spacing
* Sure, scream too
* Changes oil reaction a bit
- Cooking oil now burns off to an inert version
- The oil deposits yellow oil on the ground too
* FUck I deleted iodine
* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
* Steel review
* review
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
2022-10-05 16:57:47 +01:00
33d844aba0
Fix #18913 splashing acid on masks no longer displays "Your [null] melts away!" ( #19134 )
...
* doesnt melts away [null] anymore
* edit on line 358 and update to QDEL_NULL
* Update code/modules/reagents/chemistry/reagents/toxins.dm
Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com >
* Update code/modules/reagents/chemistry/reagents/toxins.dm
Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com >
* Update code/modules/reagents/chemistry/reagents/toxins.dm
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
* Update code/modules/reagents/chemistry/reagents/toxins.dm
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com >
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2022-10-01 16:50:56 +02:00
b3cd14d3ad
Reworks nanocalcium injectors to be better. ( #19122 )
...
* Reworks nanocalcium injectors to be not shit
* better
* no s
* better math
* Update code/modules/reagents/chemistry/reagents/medicine.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* removes dead, updates percent
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2022-09-25 17:48:12 +01:00
Henri215 and GitHub
c2aba93317
removed var digestion_ratio ( #19114 )
2022-09-21 21:50:06 +01:00
Qwertytoforty and GitHub
065ffff420
Removes radioactive gel from blobs ( #19103 )
...
* Removes radioactive gel
* removes the colour define
2022-09-21 21:45:05 +01:00
FloFluoro and GitHub
24895dc6c5
Beer2 no longer instastuns ( #19040 )
2022-09-17 10:47:40 +01:00
Contrabang and GitHub
f86f59f177
Revert "Changes SR to not be an instant and unavoidable revival. ( #18910 )" ( #19089 )
...
This reverts commit 37a3902a83
2022-09-17 00:15:21 -05:00
37a3902a83
Changes SR to not be an instant and unavoidable revival. ( #18910 )
...
* SR changes
* they really should explode before anything else
* Update code/modules/reagents/chemistry/reagents/medicine.dm
this is what i get for ~~stealing~~ reusing code
Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com >
* allows for people with no client to be revived
Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com >
2022-09-16 17:51:46 +01:00
Neth and GitHub
c5b32512ab
Adds Species Drinks ( #18734 )
...
* Merge
* linter be nice
* memes--
* removed force-says and force emotes
* changed Skrell drink
* modified Skrell drink
* review fixes
* changed grey drink
* fixed conditions
* fixed an oopsie
* more fixes
* facepalm
2022-09-08 22:10:18 +01:00
ParaGitV and GitHub
e13353e77e
Spraytan overdose update ( #18788 )
...
* Spraytan Line Updates
* Punctuation update
2022-09-01 15:20:24 +01:00
Nathan Winters and GitHub
417ad89267
Small container transfer rate change improvements ( #18780 )
...
* Avoid extraneous warning on `set_APTFT()` cancel
* Add `set_APTFT()` success feedback message
* Standardize `possible_transfer_amounts`
* Cryptic var names begone
* Unhardcode "It will transfer X units" examine note
* Fix grammar
2022-09-01 13:31:18 +01:00
980bbb489d
Adds a New Drink: The Bilkshake ( #18932 )
...
* Update drinks.dmi
* Update alcohol.dm
* Update drinks.dm
* Update drinks.dm
* Update code/modules/reagents/chemistry/recipes/drinks.dm
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
* Squashed commit of the following:
commit c61a50031991113370+Contrabang@users.noreply.github.com >
Date: Mon Aug 29 18:05:38 2022 -0400
Fixes some broken code with a dirt grenade (#18928 )
* i hate old code i hate old code
* good fix im so good at code
commit 034a6403da20936555+Gatchapod@users.noreply.github.com >
Date: Mon Aug 29 23:01:52 2022 +0200
More positions for body scanners and sleepers when using a wrench (#18815 )
* Adds positions to sleepers and scanners
* Requested changes
Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com >
commit 7b8f0f3d6662493359+Tokorizo@users.noreply.github.com >
Date: Mon Aug 29 11:17:25 2022 -0500
The Bartender's shaker now acts like a real shaker! (#18852 )
* SHAKESHAKERHSKAERIT
* Update code/modules/food_and_drinks/drinks/drinks.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
* maint recommends
* Update code/modules/reagents/chemistry/holder.dm
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
* STOP SHAKING MF
* Update code/modules/food_and_drinks/drinks/drinks.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
commit 8a1033678025063394+AffectedArc07@users.noreply.github.com >
Date: Mon Aug 29 16:45:49 2022 +0100
The headcoder shuffle (#18923 )
commit 629c099db725063394+AffectedArc07@users.noreply.github.com >
Date: Mon Aug 29 16:45:29 2022 +0100
Refactors status displays (#18811 )
* Refactors status displays
* biggest commit
commit 5d3310cdef25437893+Christasmurf@users.noreply.github.com >
Date: Mon Aug 29 15:39:56 2022 +0100
Bag icons fixes + Extra bag sprites for vox/grey (#18903 )
* icons
* dufflehandle
* Update drinks.dmi
* Update code/modules/reagents/chemistry/recipes/drinks.dm
thanks hal
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
* Update code/modules/reagents/chemistry/reagents/alcohol.dm
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
2022-08-31 16:07:49 +01:00
Pidgey and GitHub
ddfecf85f5
- Converts honeycomb from reagent_containers to type reagent_containers/food/snacks. ( #18922 )
...
- Adds honeycomb as an item that can be picked up in plant bags.
2022-08-31 13:20:26 +01:00
Adri and GitHub
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
2022-08-29 11:10:16 +01:00
AffectedArc07 and GitHub
34ed47ae74
Refactors stack traces, tiny bit of cleanup ( #18773 )
2022-08-14 02:11:40 +01:00
7276267a94
Replaces vox O2 downside with vox only blood. ( #18523 )
...
* Replaces vox brute downside with vox only blood.
* I'm dumb, but at least I am not stupid
* Update code/modules/reagents/chemistry/reagents/water.dm
Co-authored-by: Adri <jozsef.adrienn@gmail.com >
* Add to medbay, cargo, makes blood colour work
* more readable
* Update code/modules/reagents/chemistry/reagents.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
* spacing, removes == "Vox"
* test time
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* makes it work and testing works
Co-authored-by: Adri <jozsef.adrienn@gmail.com >
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2022-08-11 00:41:17 +01:00
