* 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>
* Automatically set launched syringes to inject
* Implement for normal syringe guns too
* Put mech syringe back to draw mode if emptied when shot
* Use syringe's defines
* Move defines
* update paradise.dme
* Add comment for defines
* do not set RSG syringes to inject
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
* biting off more than I can chew, but I feel like hurting myself
* more shit
* progress continues, moral stays sameish
* bite of 2587
* mod_theme down, but probably broken
* 385 errors, 16 warnings, zero tgui interactions
* 292 19
* final strech to buggy mess, break time
* it compiles. It almost fucking certainly doesnt work, but it compiles
* fudhsciffubgsbgpgb actions not working as should for modules
* fuck it we'll just open the pr as we work on it
* icons work now
* tgui stuff
* more progress
* JUDGEMENT
* IT LIVES. TGUI LIVES. Special thanks to Sirryan and my brother.
* jetpacks, gps, and go do what exo-suits yourself
* almost ready
* sorry to whoever has to review this
* should work™️
* should be good now
* pushing changes so I can do reviews next
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* lore™️ Adds illegals level to modsuit parts from syndicate.
* early returns
* and these illegals
* no uplink reference idiot
* mod inhands are a good idea
* this is needed for inhands nerd
* Bomb detector working, modsutis cover ears. skin things
* overslotting removal, cyborg charging, ert loadout for gamma
* duplicated signal
* modsuit themes, removes broken mister / bad base type module, 2 cores in robotics.
* tether module, orb module, holster stuff
* built in no slip, cheaper 87
* removes modules already installed, engineer ert get jetpack, equip into modsuit storage
* comments spaces and duplicate flags
* Some adjustments and thoughts on armor, heads get guns because they are cool like that / looting command members armor
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Compile TGUI, slowdown adjustment, Modsuit to MODsuit
* sonar, do after, more equipment, acid handling
* overlay bugs / ERT / DS suits autodeploy
* middle click action buttons
* traders, sec modsuit energy nerf
* surplus weighting
* Kinesis module.
* Pathfinder module, kinesis balance, blueprint for pathfinder and kinesis
* more power / unused module removed
* name, ds fix, pre equipped to cc suit
* depot / grammer
* ok should be good™️
* overslot, dupe gun, missing suit storage
* stealth nerf, new kit
* gun stuff / ds theme
* bio armor is gone
* let me push changes please thank you
* makes shocks work right
* copies over some changes TG made to module prices after porting
* Merge remote-tracking branch 'upstream/master' into Because-I-hate-myself-and-someone-has-to-try-it-
* sirryans changes
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Update code/modules/telesci/gps.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Update code/modules/telesci/gps.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* Control define, ERT / DS have gloves / boots again.
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* More changes
* god I hate tgui. Why do all the bundles live underground, instead of in my basement?
* she updates my master till I testmerge
* modsuits can recharge again
* fixes a lot of shit
* Ready for TM probably
* sure fuck it whatever that makes sense I guess
* the pinpointer works better™️
* Another storage module bug fix
* hair and medical stuff
* fuck fuck fuck
* fixes sonar
* Bag exploit fixes / plasma runtimes / ear nerf
* dna lock improvement / cryostorage
* whoops
* Ball form second cooldown wasn't helping, no more infinite cores
* she springs my lock till I ***SNAP***
* plasmaman no longer die
* fixes modsuit emp issues
* atmos no longer fucking dies
* Fixes, module printing, and a restriction on newly constructed modsuits
* Inventory code my hated
* WOOO PREFERENCE CODE WOOOOO
* icons my hated
* fix for mods / spaceproof shit
* holy shit whhhyyyyy
* backpack first
* Update mod_theme.dm
* prevent infinite gun arms / infinite modsuit cores / syndicate modules
* fixes tm error
* scream loudly if species sprites break. They shouldn't, but, you know.
* deconflicted with luck
* converts to refit for species
* fix pathfinder
* fixes modsuits being funky power wise
* lockboxes :gatto: , as well as DN-MP shield lock, and slight nerf to atmos modsuit
* nerfs the atmos modsuit
* magboots for ds / CC modsuit
* downside of autosave: typing in wrong window saves bad stuff
* Gamma ERT have internal cameras again.
* spellcheck when
* ah fuck
* yes delete the null that works
* whoops
* fixes error / description
* un vulps your cannon
* fixes tails disapeering on base modsuits
* space to underscore
* tgui fix / tajaran
* springlock buff, cryopod fix
* u helps
* WHO PUTS A GUN IN ITEMS
* tgui moment
* mining modsuit nerf / hidden holster module
* PAIN
* UNATHI TIDE STATION WIDE
* I love special code
* slightly dense
* shark jumpscare
* fixes ghost item, fixes springlock being bad
* YIPPEEEE IT WORKED
* she decons my flict
* pain
* ebbas days are numbered :^)
* hidden
* r-r-r-ebuild
* fixes more bugs
* qwerty, you are dense
* fixes gps
* fix mulebot crate
* level fix
* adds back icon
* moving storage, fix bug, modules activate / deactivate message
* yeah
* yeah
* yeah™️
* steels requests
* windoors no longer make pathfinder module explode
* chat spam
* oil slicks + modsuits
* whoops
* bag check
* ofc
* Update code/modules/mod/mod_control.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>
* Update code/datums/uplink_items/uplink_nuclear.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/mod/mod_control.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Update code/modules/mod/modules/module_pathfinder.dm
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
* 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
* 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
This is a merged port from /tg/station and Virgo on logging standards.
The diary has been replaced with GLOB.world_game_log, diaryofmeanpeople
is gone (because it wasn't actually used) and a whole bunch of logging
procs have been changed to optimize Splunk.
* commit for branch swap
* branch swap again
* BLEED
* trying to clear up compile errors
* i killed everything when i tested this...
* restorealltheblood
* I REMOVED A THING
* well some progress
* stop bleeding
* got to swap branches again.
* grr
* damn bloodcolors
* Squash everything
* color....colourrrrrrr
* color....colourrrrrrr
* well now that updated the branch...
* Changes
* Some tweaks..before i upload something major
* COLOR NOT COLOUR...COLOR
YES I KNOW NOT EVERYONE SPELLS IT LIKE THAT BUT MY GOD
* Foot print shit..
blood coloring is going to be PAIN
* trying to handle some colors..maybe.
* blood colorsing sucks..di i mention this?
* commenting cod malfunctions.
* Changes
* lets try this
* Its too late at night.
* blargh
* woops
* almost works...
* progress..
* Branch swap
* figured out the overlay issue....
* BRANCH SWAP
* BLARGH
* fixed merged conflicts..expect something to be horribly wrong.
* bunch of changes
* Major Fixes
- Moved blood_state and bloodiness var definitions to
/obj/effect/decal/cleanable/blood as well as /cleanable/Crossed(), in
order to make blood color work properly.
- These were not used by any other decal, so it was pointless.
- Tweaked human/add_blood so that hand_blood_color uses the correct
value now.
- Corrected gibs having the wrong basecolor.
- Tracks of different blood colors will no longer combine weirdly, and
will instead form seperate overlays.
- This also fixes all of the issues with tracks in general and not
updating correctly.
- Fixed transfering blood in add_fingerprint; the old detective code
didn't use the new format for add_blood().
- Fixed xenomorphs causing runtimes in makeTrail(), and gave them their
own trails. Sprites should probably be brightened later.
- Fixed mobs occasionally randomly having their blood_DNA list reset.
* may have accidently removed shit.
* Mrowl
* stiff
water is not bleeding
lowered trail making threshold
* tweaks then conflcits
* weee
* indent
* some tweaks
* somefox tweaks.
* derp
* why won't they bleed!?
* BLEED DAMMIT
* Flattist comments and removes simple animale blood volume
Cause i cannot get it to work right.
* PRAISE FLATTIST
* Simple animals have a blood volume now
Bug with trail fixed.
* changes
* thanksmrowlmrowl
* exotice blood trails
* makesure is an exotic bleeder has a bleed rate first...
* FoxBoxTweakSox
* BoxVoxSoXFox
* ONE MORE THING
* animalsbleedreds
* Buh? BUGH!
* thisismescreaming
* removing note needed thing
* Color changes but the rabbit hole continues.
* This is not pretty....
* wot
* IT WORKS DAMMIT
* colors.
* germaphobic commit..
* we have to use the old system
* nothing to see here
* doubleprocarady
* try to fix mulebots
* mulebot fixed
* DONE
* 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
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.
