* starts it
* Update magic_tarot.dm
* MORE PROGRESS
* So many thanks to Cloudbucket, for sprites
* The Work, the Art, continues.
* more changes
* pushes the Work foward. All cards done.
* and more thanks github
* adds to BSH
* tochat
* Finishes QWERTYTODO. Magic key. World smoke
* Isaac and his mother lived alone in a small house on a hill. Isaac kept to himself, drawing pictures and playing with his toys as his mom watched Christian broadcasts on the television. Life was simple, and they were both happy. That was, until the day Isaac’s mom heard a voice from above. “Your son has become corrupted by sin. He needs to be saved.” “I will do my best to save him, my Lord,” Isaac’s mother replied, rushing into Isaac’s room, removing all that was evil from his life. Again the voice called to her, "Isaac’s soul is still corrupt. He needs to be cut off from all that is evil in this world and confess his sins." “I will follow your instructions, Lord. I have faith in thee,” Isaac’s mother replied, as she locked Isaac in his room, away from the evils of the world. One last time, Isaac’s mom heard the voice of God calling to her. “You've done as I've asked, but I still question your devotion to me. To prove your faith, I will ask one more thing of you." "Yes Lord, anything!” Isaac’s mother begged. "To prove your love and devotion, I require a sacrifice. Your son, Isaac, will be this sacrifice. Go into his room and end his life, as an offering to me to prove you love me above all else." "Yes Lord", she replied, grabbing a butcher’s knife from the kitchen. Isaac, watching through a crack in his door, trembled in fear. Scrambling around his room to find a hiding place, he noticed a trap door to the basement hidden under his rug. Without hesitation, he flung open the hatch, just as his mother burst through his door, and threw himself down into the unknown depths below.
* nanny bag it before I forget
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* returns early
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* RE-RE-RE-REVIEW
* 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>
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>
* requested changes and such
* duh
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* returns early
* Update code/datums/status_effects/buffs.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* new hrefs here to troll CI :trollface:
* Update code/game/gamemodes/wizard/magic_tarot.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@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>
Co-authored-by: synthtee <127706731+SynthTwo@users.noreply.github.com>
* alphabetizes bamboo seeds in vendor
* makes caltrop component properly check for outer suit flags
* removes bamboo stool from wood recipes and adds it to bamboo recipes (i am very dumb)
* adds most things
* STOP BECOMING CRLF
* half the sprites ported
* adds floor turfs, hopefully
* adds bamboo stack recipes and parameter documentation for datum/stack_recipe
* adds the crude syringe and sprite
* Revert "adds the crude syringe and sprite"
This reverts commit d949332055.
* adds crude syringe and sprite
* nevermind, goon license moment
* bamboo walls, false walls, and sprites
* caltrops check for shoe thickmaterial flag
* added spear and fixed filepaths
* smoothing and caltrops are even more broken
* Fixes sprite smoothing and caltrop weirdness
* whitespace
* fixes tile stacking
* Henri review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* royal blue and red carpets no longer smooth
* henri review
* actual henri review, thanks git
* Henri review electric boogaloo
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* removes bamboo walls (rip)
* Update code/game/turfs/simulated/floor/fancy_floor.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: cybercapitalism <98280110+cybercapitalism@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* cult 1
* massive data refactor
* progress
* More crap
* IM SCARED IT COMPILES
* oops
* more fixes
* good comment
* hell yeah, team control
* lol
* blamo
* blam
* More stuff
* team refactor
* epic merge fail
* src not _src_
* more
* progress
* cult
* more stuff
* water
* goodbye __IMPLIED_TYPE__
* time to undraft
* FUCK FUCK FUCK
* okay this is better
* goodbye todos
* fix
* order of operations
* last fix? maybe
* yeah
* oops
* okay this should be ALL the fixes
* wow
* hell yeah
* wow
* fixes duplicate teams + adds more team safeties
* how the fuck did this happen
* admin objective improvements
* wah more bullshit
* guh
* fuuuuck
* fucking hell
* fixes
* Adds soil clumps, which are used to make soil(alternative to sandstone).
* Adds soil clump recipe to the biogenerator
* Adds the compost bin to the game. Which converts biomass to compost and makes soil from it.
* Adds sprites for the compost bin
* Adds a recipe for the compost bin(10 planks)
* Added interface for the compost bin.
* Applying suggested changes to compost bin(redundant condition removal, spell check, auto doc)
* Applying suggested changes to soil sheets(initialize, remove empty line)
* Changed min and max to clamp where able, removed redundant return, compost recursion stays in convert_biomass().
* Call parent on init
* Identation and style changes
* Rephrase description
* Unauto docing unnecessary bits, clicking with screwdriver no longer an attack, removed redundancies, reordred ui procs and changed ui data list to new format.
* Converting plant to biomass is now its own function
* removed SOIL define. using path as is instead
* Moved the compost_bin-3 sprite up a pixel so it aligns with the rest
* Added spaces for readability
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Moved plant deletion to make_biomass()
* Rebuilt tgui
* Filled gaps in sprite with mostly transparent pixels to make it easier to click
* Rebuild tgui
* rebuild tgui
* Adds the soil clump sprites back after update
* Added Trailing newline to compost_bin.dm
check said it's missing
* Adds a check for presence of biomass when initializing to prevent unneeded proc call
Checks whether a compost bin has any biomass before attempting to compost it.
* Adding back compost bin icons
* rebuild tgui
* Made interface window slightly shorter.
from 300 to 200 pixels tall.
* Replaced the enough_compost() proc with an if statement in the only place it was used
* Replaced the compost() proc and calls to it with process().
* Rebuild TGUI
* Removed an unused var, idented a comment, and returned the onhit proc to it's original form
* Ran prettier on the compost bin interface file
* Wake Up Icon Diffbot
* Aw shit, here we go again.
* Empty-Commit
* Wake up icondiffbot
* Last attempt for today
* Removed redundant new line from sheet_types.dm
* removed redundant new lines and moved the ui procs together.
* Changed compost label to Compost
* Recompile tgui
* Rebuild Tgui
* Rebuild TGUI
* Rebuild TGUI
* Capitaliize the word soil in the biogenerator listing for it
* following some suggestions
Replaced compost capacity defines with "magic numbers", removed redundant init proc, added spaces around a '-' sign.
* Removing a redundant check in the insertion proc.
moved the check for the compost bin being full to the end of the loop since I already make one before the loop starts.
* Rebuild TGUI
* Rebuild Tgui
* Update code/game/objects/items/stacks/sheets/sheet_types.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Rebuild TGUI
* ReRebuild TGUI
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Add stupidly strong and pain to make wheelchairs
- i dont know how to name them better tbh
* Add wheelchairs description
* Changes typos:
- Sorry but i am bad at sprites
* Sprites and slight config
* changes x_x
* Decreased times for wheelchair crafting.
* wheelchair is now typed as "wheelchair"
* peep bop sup boop bip boop beeeeeeee-
- stack amount removed, inherd good.
* skreee
no i am not vox player, but it fit for this thing perfectly.
* changes
please let it stop
* Henri requested changes
* Tweak kitchen spike
* fix deconstruction
* fix mistake lmao
* revert wrench_act and fix metal drop
* fix accidental removal
* and the damn end of line
* AAAA
* add mob check to victim, deconstructing tweak
* fix bug preventing attack on spikes
* Fixes#18882 and refactors for door assemblies
* Removes text2path, makes wooden airlocks buildable
* Use mineral crafting menu
* Minor oversight
* Comments improvement
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* Review suggestions
* Removes unneeded vars
* Fixed tab spacing
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
* Atmospherics refactor
* META(GAMING)
* Cleanup
* RPD hotfix
* Fox review
* Do this
* Well that escalated
* Repath these
* Ah yes, scope creep
* Remove this comment
* Regression #1
* Get pants that match or else you gonna look silly yo
* Posters
* Fix other hud elements
* Rereviewed
* Update shotglass.dm
* Fix for new merged PRs
* Typo
* Coming across other stuff
* Update theblob.dm
* No takebacksies
* smh i forget to leave a comment
* Updated for the detgun and cards
* Should have rerun langserver again
* No longer plastic, more in scope
* Damn you bluespace
* Reverting turret logic, out of scope at this point
* Tweak that part
* Went over energy guns again, and fixed UI White's sprite sheet
* Welding masks, glasses, and JUSTICE
* Update portable_atmospherics.dm
* Cleaning up, clearing things up
* Review and suggestions
* Update valve.dm
* More tweaks
* Missing character
* Not distinct lightmasks, so they can be overlays
* Update generator.dm
* Add parameter so holodeck doesn't try to make a perfect copy
* Update unsorted.dm
* Spiders
* Better fix for spiders, fix vamps too
* Ghosts
* Update telekinesis.dm
* Cleaning up old procs
* It's set up to not copy datums... Unless they're in a list
* Donuts, duct tape, and detgun. D3VR coming to Early Access
* Update procs that interact with doors so they call update_state instead
* Forgot one spot, and actually might as well just force lock
* Cleaning up other things... Sigh, and kitty ears
* oops
* Getting used to how it works
* blinds
* Going back to the suit obscuring thing, so it doesn't update all the time
* Missed that from merging master
* I made this PR and forgot about it
* Fix runtimes in cards
* Make things a bit more unified
* Update update_icons.dm
* yarn, really?
* Update library_equipment.dm
* Update shieldgen.dm
* Every time Charlie merges something, I go back and see if I can improve things further
* what's this? more?
* Update misc_special.dm
* wow, paper
* Review
* More reviews
* To be sure, seems like being broken messed something sometimes
* Brought airlocks closer to how TG works to iron out some stuff
* Pizza and morgue
* Doesn't seem to hurt, tried with holodeck
* Revert "Doesn't seem to hurt, tried with holodeck"
This reverts commit 158529302b.
* Icon conflict
* Fix organ damage
* Don't ask how. Why. It's like that on prod too.
* Cutting down on things and updating from TG.
* More flexible. Just in case the thing you stuck it on didn't destroy.
* Hydro was one the things I touched earlier on, better rework it
* Reviews
* Cleaning up further, also bri'ish
* Undo a change I did, and switch over to a more recent implementation
* Update biogenerator.dm
* Rolling back to old airlocks, but with new duct taped note
* Functionally the same. I'd just rather not have the smoothing happen there
* Went over APCs again
* Fix welding helmet names in species files
* Update airlock.dm
* Update persistent_overlay.dm
* Oh, topic
