CRUNCH
8274dcccac
Return the parent function thanks ( #26679 )
2024-09-16 14:42:19 +00:00
CRUNCH
e87982e794
Update cigs.dm ( #26694 )
2024-09-06 09:27:59 +00:00
CRUNCH
9ef47e7935
Enhances the Smoking Experience - Adds Many New Item Interactions for Cigarettes and Items Interacting With Them ( #25571 )
...
* Refactoring and other stuff.
* moar
* More smoking
* Update energy_melee_weapons.dm
* Update code/game/objects/items/robot/cyborg_gripper.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* 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 cigs.dm
* Update cigs.dm
* Update cigs.dm
* Update code/game/objects/items/weapons/lighters.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* 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 >
* eee
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* sigh
* Update cigs.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 >
* hell
* Update cigs.dm
* aa
* cool
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* aa
* aaa
* suffering
* Soon
* Is it done!? Am I finally free!?
* 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
* Update
* No longer assume the cig is in a mouth
* Update tools.dm
* Update pronouns.dm
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* update
* Attack animations for sword lighting!
* Update
* indentation
* Update cigs.dm
* minor refactor
* Update items.dm
* Update items.dm
* Update welder.dm
* Update energy_melee_weapons.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 >
* refactor
* Update items.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 >
* Fixing some minor typos for cyborg upgrade flavour text
Throws in some missing apostrophes, capitalisation, and the letter "s."
* Briefcase Full of Cash buff
Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr
* Reverts double-feature PR
* Reverts a broken revert
* Reverting again because Ebba told me to
* And reverting yet again
* Update robot_upgrades.dm
* Update flamethrower.dm
* clipping
* Update legion_loot.dm
* anti attack check
* Fixes a zippo runtime
* Fixes evil runtime and stops unnecessary violence.
* 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 based on review
* Update cigs.dm
* Update energy_melee_weapons.dm
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update toys.dm
* Update energy_melee_weapons.dm
* Update legion_loot.dm
* Update code/game/objects/items/weapons/melee/energy_melee_weapons.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: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-09-03 13:02:13 +00:00
Spaghetti-bit
cbeedfca9f
Parrying Refactor, Adding Parrying to Select Two-handed Weapons: Parry This You Filthy Casual! ( #26043 )
...
* Refactors parrying and how parrying is handled. Also gives most of the melee wizard weapons parrying as well as most two handed weapons.
* Forgor the blood spear :)
* Renames `special_parry_condition` to `requires_two_hands`
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
* Update code/datums/components/parry.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
* applies suggestion from @lewcc
* Removes the two handed requirement from cult spear as per @Qwerty's request
* Apply suggestions from code review (1/2) from hal
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
* Apply suggestions from code review (2/2)
* ...accidentally removed an icon in `energy_melee_weapons.dm` when I deconflicted stuff. 💀 ready for review.
* Again, variable added back during deconflict. issues resolved.
* Update code/game/objects/items/weapons/shields.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
2024-07-30 12:33:02 +00:00
DGamerL
098b13bb33
Removes the empty type of /snacks ( #26010 )
...
* Aaaaa it works
* Add updatepaths
* Add unsaved files
* MATTTTT
* Fixes casino
* Fix
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-07-29 14:46:04 +00:00
DGamerL
e2e6dd50c3
Oops ( #26204 )
2024-07-11 03:33:15 +00:00
DGamerL
09a4ed795c
Various rollie fixes ( #26163 )
...
* Various rollie fixes
* Fixes
2024-07-08 12:54:20 +00:00
CRUNCH
62a7d79358
Update cigs.dm ( #25842 )
2024-06-28 03:16:32 +00:00
CRUNCH
ee6879ad7b
Replaces the Nicotine in Rollies With Weed ( #25840 )
...
* Update cigs.dm
* Update cigs.dm
2024-06-28 03:15:33 +00:00
PollardTheDragon
48f429e307
Added smoketime calc to adding reagents ( #25933 )
...
* Added smoketime calc to adding reagents
* Math fix
* Spacing
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Improved calculation
* SIMPLIFICATION MATH
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-28 03:08:46 +00:00
Migratingcocofruit
2903560dc1
Pipe fix/tweak ( #25431 )
...
* Pipe fixes and tweaks.
Allows refilling of pipes using dried plants, removes their ability to conjure nicotine, and applies the May 22, 2015 pipe tweak to cob pipes, and make them start empty(corn has no nicotine).
* refilling pipes now sets smoketime
* oops
* Adding spaces to comments
2024-05-24 18:30:45 +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
Charlie Nolan
e0c335e998
Cigar/pipe cleanup. ( #24683 )
2024-03-19 10:49:06 +00:00
DGamerL
b11002b67b
Fixes cigars being lightable by everything ( #24235 )
...
* Fixes cigars being lightable by everything
* Update code/game/objects/items/weapons/cigs.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/game/objects/items/weapons/cigs.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-02-21 09:04:59 +00:00
DGamerL
db578cdc6f
Makes food not a subtype of reagent holders ( #23379 )
...
* I am suffering
* Alright this should be all now
* Fixes CI
* I hate the online merge resolver.
* This got lost in the merge master
* Updatepaths fixed + new added
* Contra review
* Fixes desserts
* Oops
* This should fix it
* Maybe?
* Attempt 3
* Missed conflict
* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Update code/modules/food_and_drinks/food/foods/pizza.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Fixes grinders
* Adds comment
* Warrior review
* Warrior + Sirryan review
* Update code/modules/food_and_drinks/food_base.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-01-21 19:00:02 +00:00
DGamerL
004d7d10b7
Refactors is_hot and fixes some issues from the beaker lighting PR ( #22964 )
...
* Idk what I'm doing
* The is_hot refactor
* Fixes that I forgot to push before making the PR
* Update code/game/objects/items.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Contra review
* TODO: Find out why this isn't working
* Removes the signal stuff for now, this works
* Fixes it all
* Add new signal
* Update code/_onclick/item_attack.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Contra reivew
* Ayyy it works
* Merge master
* Forgot this one
* Update code/game/machinery/doors/airlock_types.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/objects/structures/mineral_doors.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/turfs/simulated/floor/mineral_floors.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/turfs/simulated/walls_mineral.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
---------
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-12-11 16:53:51 +00:00
1080pCat
e2ffb8a882
Engineering borg nerf (just their decompiler ;p) ( #23227 )
...
* Engi borg nerf
* Update code/game/objects/items/devices/flashlight.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/fancy.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/fancy.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/modules/food_and_drinks/drinks/drinks/bottle.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/friendly/lizard.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/modules/projectiles/ammunition.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/modules/reagents/reagent_containers/chemical_bottle.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update lighters.dm
* Update spiders.dm
* reverts some that maybe should stay
* oops
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2023-11-14 12:51:13 +00:00
Contrabang
f3f9bd442a
Changes slot number defines from lowercase to all uppercase ( #22297 )
...
* undo all of it
* flags
* back
* head/mask
* left
* right
* Cuffs
* other name changes
* ID and PDA
* idk about calling them SLOT_HUD now
* glasses, gloves, and shoes, oh my!
* the rest
* comment
2023-10-03 18:27:51 +01:00
Sadhorizon
0e371e1b93
Unathi (and Ash Walkers) can ignite stuff now, removes tail lash. ( #21981 )
...
* stuff
* works!
* bye bye tailwhip
* renames the ability
* accidental enter
* snowball's reviews
* tweak
* less tight timing
you can now ignite on 3u instead of 4
* no longer works with covered mouth
* ash walkers
* most of jimkils reviews + unathi also have c/d now
* early returns, uses less fuel, comments
* hal's reviews
* redundant comment
* hal's suggestion
* sounds & tweaks
* an unnecessary check
apparently
* so that check WAS needed
* henri reviews, tweaked loc of sounds, timer tweaks
* henri review
* Update code/modules/mob/living/carbon/human/species/unathi.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-09-13 21:25:09 +01:00
JimKil3
5450f598bf
Adds the holo-cigar, a human-specific traitor item ( #22062 )
...
* badass trait
* the cigar
* sprites ft. mcramon
* makes it obtainable
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* contra review
* Update code/modules/reagents/chemistry/reagents/medicine.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/game/objects/items/weapons/cigs.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* henri review
* contra broke everything
* contra broke everything pt 2
* Update code/modules/clothing/glasses/glasses.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/cigs.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* lewc review
* update_icon_state
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/game/objects/items/weapons/cigs.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* are you happy now dgamer
* henri review 2
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2023-09-12 17:10:23 -04:00
Mooballoono
9e0dd390a2
Zippos can light Cigars ( #21059 )
...
* Makes it so Zippos can light Cigars
* accidental commit to master
* Zippos can light Cigars
* parentheses were in the wrong spots
2023-05-22 22:06:46 +02:00
Henri215
627a46a068
more options for matter decompiler ( #20874 )
2023-04-22 09:44:33 +02:00
Henri215
7f080f2a3c
Adds some sounds to lighters/cigs ( #20862 )
...
* more sounds for lighters
* final adjustments
* lower volume for light.ogg
* Contrabang review
2023-04-22 09:44:20 +02:00
Livi
1a10d9a569
Fixed custom rollies having nicotine by default ( #20757 )
2023-04-22 09:27:52 +02:00
Charlie
8ef4aa727e
Adds Shadow demons ( #19732 )
...
* reshuffle
* shared base type
* moves this to the base type
* the monster
* event
* FUCK
* better sprites
* refactors bloodcrawl, more nice sprites
* review stuff
* Apply suggestions from code review
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
* heart of darkness
* pre TM tweaks
* ARGH
* hopefully fixes double hits
* tweaks
* derp
* tweaks
* TEMP RUNTIME REMOVE LATER
* fixes
* runtime fixes
* cig runtime fix
* review + another runtime fix
* re adds sprite
* removes runtime
* oop I forgor
* DRUNK CODING
* SPRITES
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com >
2022-12-29 11:26:37 -06:00
moxian
51e5384299
Move clothing to /Initialize() ( #18294 )
...
* Move clothing to /Initialize()
* Farie review
2022-07-21 11:42:24 +02:00
Lumi
391a044df1
Grammar fixes ( #18342 )
...
* grammar fixes
cant - can't
removes duplicate the from mobs
the pain in your the -
treads on the lit the lit -
what you can cook with this the -
* should fix the merge conflict
0 to FALSE
* unconflicts
panther will have to be fixed at a later date
2022-07-17 15:36:03 +01:00
SabreML
146351ae82
Cigarette overlay update ( #16936 )
2021-10-15 11:00:26 +01:00
Mieszko Jędrzejczak
7c39eafafe
midori-san ( #16856 )
2021-10-09 17:06:43 +01:00
SabreML
6648d3131f
Clothing Organisation V1
2021-08-24 18:37:48 +01:00
SabreML
04c689817e
Fire + Cloth = Bad things ( #15635 )
2021-07-08 22:57:08 +01:00
SabreML
0b375de42c
Removes the the vast majority of 'The the' from the the code ( #15597 )
...
* The the
* Some more
* Review 1
* A couple more
2021-06-20 10:20:32 -04:00
Fox McCloud
fc128af66c
Fixes Cigarettes rendering on mob when on the ears ( #15363 )
2021-01-28 18:46:19 +00:00
SabreML
3aea152a93
Fixes
...
Changed 'Your' to 'The', since it's a 'visible_message'.
Also removed implied src
2020-09-12 16:43:39 +01:00
SabreML
af2ea50764
Cigarettes catch fire
2020-09-12 15:38:57 +01:00
warior4356
b30ff7e2e9
Minor fixes. Removes Plastic
2020-07-14 21:26:45 -07:00
warior4356
cb06ebdd9f
Refactor complete. Matches added.
2020-07-13 22:05:56 -07:00
Fox McCloud
37d30a9057
Optimizes Smoking
2020-07-10 03:04:35 -04:00
Fox McCloud
70b46d8aea
Life refactor ( #13471 )
...
* Life Refactor WIP
* part 2
* part 3
* runtime fix
* newlines
* tweaks
* perspective checks
* fixes
* remote view tweaks
* more fixes
* robot fixes
* better updating
* cleaned up icon procs
* less proc call overhead
* performance gains
* more optimization
* shorter lists, removal of unecesary code
* gene OOP and dna styling cleanup
* oops
* axe disabilities
* typeless loop
* various tweaks and fixes
* brain checks
* runtime fixes
* cryo vision fixes
2020-06-03 19:43:30 -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
Fox McCloud
47263ded27
Merge remote-tracking branch 'upstream/master' into cig-tweaks
2020-03-08 22:35:49 -04:00
Fox McCloud
1f4cc7c75f
clean up
2020-03-07 17:41:17 -05:00
Fox McCloud
4d9c89bdc0
menthol
2020-03-06 23:48:32 -05:00
Fox McCloud
c059b6ba95
Cigarette Tweaks
2020-03-04 00:32:39 -05:00
Citinited
fddff1049b
[Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers ( #11700 )
...
* Adds support for self-filling reagent containers
* Sets tool_behaviour on the default set of tools
* Fixing merge conflicts
* Refactors welder to use tool behaviour
* The refactor: part I
* The refactor: part II
* Tool Refactor Part III: Revenge of the Maint
* Tool Refactor Part IV: A New Hope
* Tool Refactor Part V: The Oldcoder Strikes Back
* Tool Refactor Part VI: Return of the Coder
* VII
* Holy shit, it compiles?!
* Nannek I completed your TODO, you owe me ice cream
* Tool helpers; telepad is compliant
* Bugtest, Round 1: Fight
Fuck refactoring disposals
* Buggfixing, Round 2: Electric Boogaloo
* Personal crafting uses tool behaviours now
* Construction datums use new tool behaviours; better way of handling fueltank refuelling; more bugfixing
* multitool_check_buffer change; removes some useless things in tool_helpers
* proc name change
* TRUE/FALSE changes
* Bugfixing, Round 3: A Good Day To Bugfix Hard
Fixes multiple issues raised by the testmerge
* Minor style changes
2020-02-15 13:31:08 -07:00
Mark van Alphen
90f71f164a
Remove unused species_fit and move chameleon file
2019-05-05 20:37:53 +02:00
Fox McCloud
0034e851a1
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
Fox McCloud
277722508a
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -04:00
Edefff
fdf6f521d6
Fix cigarette chem consumption
...
https://github.com/ParadiseSS13/Paradise/pull/10122 attempted to fix rollies by transferring .4u of each chem present in them instead of .4u shared between all chems. Prior to this, if a chem took up less than 25% of the chem volume, the user would not metabolize any as they would receive less than .1u of the chem, and amounts less than .1 are ignored.
However, that change caused all cigarettes to burn through their chems at a much faster rate than normal if they had more than one chem inside them. A full cigarette with 2 chems inside it would run out twice as fast, and 3 chems three times as fast, and so on. This means Syndicate cigarettes, for example, now last half as long.
This commit fixes the original problem whilst still maintaining the original chem rate. It still transfers .4u split between all chems, however if a chem doesn't take up enough of the total volume to transfer at least .1u, it will bump the amount to .1, ensuring each chem will be metabolized.
This also fixes the rollie smoketime to be in line with the new chem volume. The new value is 100 / .4u = 250. The old value, even without the above changes, meant that the rollie would burn out before delivering all of it's volume if it only had one chem in it.
2018-11-30 20:57:34 -08:00
Certhic
45506e6d19
runtime fix
2018-11-13 17:09:57 +01:00