* more food is good
* more cow cube
* rice as requested
* one less cow
acutally like 5 less cows oops but it was SUPPOSED to be one less
* one less of everything
* might work, but need to do more scent descriptions
* very good progress
* big commit for madam
* unused sprite
* comment cleanup
* cleaning up descriptions
* more scent desc changes
* p
* 20 seconds
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
* fixes contractions to proper english in negative.dm
* fixes possessives in miscellaneous.dm
* fixes capitalization in brain_item.dm
* fixes capitalization in liver.dm
* Fixes negative.dm typo
* adds a missing i to ai _DEFINES
* Fixes typo in cargo defines to spell auxiliary properly
* fixes contractions in code\datums\action.dm
* fixes capitalization in code\datums\components\religious_tool.dm
* Fixes spelling of sudoriferous in code\datums\diseases\advance\symptoms\fire.dm
* changes necrotizing tissues and organs to necrosing tissues and organs in code\datums\diseases\advance\symptoms\flesh_eating.dm
necrosing is proper english here
* Fixes a missing letter in code\datums\diseases\advance\symptoms\itching.dm
* Changes s to z in code\datums\diseases\advance\symptoms\radiation.dm
* Updates clarity in code\datums\diseases\brainrot.dm
* spells vengeance properly in code\datums\diseases\parrotpossession.dm
* fixes grammar in code\datums\diseases\wizarditis.dm
* fixes the spelling of "casualties" in code\datums\ert.dm
* removes extra t in code\datums\martial\cqc.dm
* Updates code\datums\martial\flying_fang.dm to match style of previous code
* adds t to code\datums\mutations\antenna.dm
* spells agitation right in code\datums\mutations\hulk.dm
* spells perceive right in code\datums\mutations\sight.dm
* fixes a contraction in code\datums\ruins\lavaland.dm
* changes "unbreachable" to "impenetrable" and "tradestation" to "trade station", as well as fixing a typo in code\datums\ruins\space.dm
* fixes typos in code\datums\shuttles.dm
* fixes a typo in code\datums\station_traits\negative_traits.dm
* Fixes a typo in code\datums\station_traits\positive_traits.dm
* Fixes spelling in code\datums\wires\mech_fabricator.dm
* fixes typo in code\datums\wounds\burns.dm
* resanguination is not a real word
* fixes typo in code\game\gamemodes\changeling\traitor_chan.dm
* fixes typos in code\game\gamemodes\clock_cult\clock_cult.dm
* fixes spelling in code\game\gamemodes\cult\cult.dm
* adds an s to posses in code\game\gamemodes\eldritch_cult\eldritch_cult.dm
* fixes a spelling mistake in code\game\gamemodes\hivemind\radar.dm
* fixes a typo in code\game\gamemodes\malfunction\malf.dm
* fixes spelling mistake in code\game\gamemodes\wizard\wizard.dm
* Fixes a spelling mistake in code\game\machinery\bounty_board.dm
* fixes whatever the fuck medical kiosks were spelling wise
* removes a t and lowercases bluespace as it isn't a proper noun in code\game\machinery\sci_bombardment.dm
* Fixes spelling mistake in code\game\machinery\shuttle\shuttle_heater.dm
* Fixes spelling issue in code\game\machinery\stasis.dm
* Fixes spelling issue in code\game\machinery\telecomms\computers\logbrowser.dm
* oranges can't fucking spell in code\game\mecha\equipment\tools\medical_tools.dm
* authentication is now spelled correctly in code\game\mecha\mech_fabricator.dm
* fixes spelling mistake in code\game\mecha\mecha.dm
* Updates "Defence" to "Defense" to be more in line with sprite information
* Fixes spelling issue in code\game\objects\items\grenades\chem_grenade.dm
* updates mecha defence mode to defense mode to be more in line with what is written as the icon_state
* Fixes english in code\game\objects\items\implants\implant_greytide.dm
* fixes spelling issue in code\game\objects\items\robot\robot_parts.dm
* fixes spelling issues in code\game\objects\items\storage\lockbox.dm
* Revert "Changes s to z in code\datums\diseases\advance\symptoms\radiation.dm"
This reverts commit 170f514f67 to change the z back to an s
* updates an extra m in object path in code\game\objects\structures\signs\signs_departments.dm
* spelling fix in code\game\objects\structures\crates_lockers\closets\bodybag.dm
* spells otherworldly correctly in code\game\objects\items\twohanded.dm
* food service is 2 separate words in code\game\objects\structures\crates_lockers\closets\job_closets.dm
* Fixes a spelling mistake in code\game\objects\items\toys.dm
* Fixes spelling of Nanotrasen in code\game\objects\items\supermatter_delaminator.dm
* Adderall is a proper noun in code\game\objects\items\sharpener.dm
* fixes spelling mistake in code\game\objects\items\religion.dm
* code\game\objects\items\puzzle_pieces.dm
* Janitalia is a proper noun
* Fixes spelling of occurrence in code\game\objects\items\miscellaneous.dm
* fixes the spelling of nurture and fixes a title in code\game\objects\items\manuals.dm
* @cuackles can't capitalize in code\game\objects\items\holy_weapons.dm
* nobody can spell environment in code\game\objects\items\holosign_creator.dm
* code\game\objects\items\gems.dm spelling fix
* spelling fix in code\game\objects\items\cards_ids.dm
* spelling fix code\game\objects\items\airlock_painter.dm
* map object paths updated for the one letter change to an object path
* more fixes
* Revert "updates an extra m in object path in code\game\objects\structures\signs\signs_departments.dm"
This reverts commit 98cb63b396.
* Revert "map object paths updated for the one letter change to an object path"
This reverts commit f4220a3505.
* Update mecha_topic.dm
* i hate myself
* inb4 webbing meta
* bandolier buff + shell box time
* oops beanbags were missing
* may the lord and savior save me pretty please
* hos now spawns with belt
* re-adds baton/cuffs/flash to locker
* Add files via upload
* changed sigtech, tourist, and clerk icons
added more detail to sigtech icon
new tourist and clerk icons
* Some more icon changes
I uploaded the wrong file
* applied grimm-hollowknight requested changes
Adds new signal technician and paramedic hud icons and reverts clerk's back, all requested by grimm-hollowknight
* ah, so thats why you reverted that change
im dumb
* why cant i merge upstream
why github
* Adds brig physicians
Adds brig physicians as a new job. There are a lot of changes, but in short:
- Added the job and many required things for it to work
- Edited maps to add lockers, landmarks, and update the brig medbay
- Added new clothing, PDAs, IDs, ect.
* Fixed some stuff
- Fixed some stuff I forget to change on some maps
- Added new landmark icons
* Removed Brig Physician's ability to be an antag
Removed Brig Physician's ability to be antag and gave them a mindshield
* Many requested changes
- Removed the flash from the Brig Physician's starting equipment
- Removed security access for non-skeleton crew and weapon access from the Brig Physician
- Added skillcapes
- Updated the Infirmary in eclipse and omega
- Added a wall mounted flash on box
- Added an anesthetic tank and medical mask to the Brig Physician's locker
- Added icons for potential future support for the changes in #11744
* Another bunch of changes
- Fixed a bunch of typos and minor mistakes (thanks TheGamerdk for pointing most of them out)
- Added support for #11744 now that its merged
- Fixed a merge conflict
* Might fix one of the merge conflicts
ahhhhhhhhhhhhhhh
I had to redo ALL of the map changes, so that was fun
* Should finally bring this back to a functional state
Should fix some of the checks failing cause the Kilo file was messed up
- Re-did the changes to Kilo
- Fixed something I left in while testing stuff
* Thought I fixed this
- Fixes the Brig Physician's skill capes using the wrong job
* Should fix wejengin2's issues with the maps
Should fix most of wejengin2's issues with the map changes.
- Changes all the emergency wall meds to normal wall meds
- Might have fixed the APCs, but I don't know if I did it right
- MapMerged Kilo
- In Omega, I fixed the decals, added firelocks, and added vents/scrubbers in the brig infirmary
- In Box, I re-added some of the missing items
- In Delta, rearranged the lights and replaced them with tubes
- In Meta, I moved the morgue tray into the unused space, moved the blood freezer into the office, and added a shelf in the infirmary
* Bows, bamboo, and bones
Ports the stuff
* Before i get yelled at
* ack
* Some sprites I forgot to save
* Syndicate bow
* Map changes
* Other bee ports
This might be a bit too much to add
* Fixes invisible bows in Fastdmm2 and a build error
* oops
* Some tweeks/fixes
* More stuff
Added more footwraps, ported tribal skirts, and fixed hardlight bows
* merg
* oops
* aaa
* Gramger
Thanks Anvilman
Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
* Revert "Merge branch 'yogstation13-master' into tribal-crafting-port"
This reverts commit b0396f5085, reversing
changes made to 3085d93160.
* Revert "Merge branch 'tribal-crafting-port' of https://github.com/nmajask/Yogstation-But-Worse into tribal-crafting-port"
This reverts commit 32967243c7, reversing
changes made to b0396f5085.
* Fix
* More fix
* removes some stuff
for now
* fixed dart guns
* Embed stuff
pain
* Update code/game/objects/items/stacks/sheets/sheet_types.dm
Co-authored-by: Theos <theubernyan@gmail.com>
* ADMIN LOG: A
* fixes
* pain
* less debug
* Readd the changes
* balance
* hardlight bow stuff
* bamboo
* starting recipes and stuff
* More clothes
Ports some stuff
* Adds the clothing to the map
* balance
* Slug fix
* MELEE!
* Crossbows
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Update code/modules/projectiles/projectile/reusable/arrow.dm
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Hardlight bow arrow embedding
* Ashwalker nest tweaks
* Balance
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
* Bow fixes and minor balance changes
* Im dum
* fix
* Update code/modules/projectiles/boxes_magazines/_box_magazine.dm
* reorganized crafting menu
aaaaaa
* huh
* fex
* removed broken code
Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
Co-authored-by: Theos <theubernyan@gmail.com>
Co-authored-by: Skrem_7 <98909416+Skrem7@users.noreply.github.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
* Innit
* 2
* Update code/modules/paperwork/faxmachine.dm
* Fixed naughty globals
* Make linter happy
* Fix barrier tape
* Fix carbon paper
* Fixes paper shredder, and some of paper budle
* Started moving fax machine to tgui
* Basic UI, faxing works, but admins can't view/reply
* Fax machines work now, you can send your ass to CC
* Started adding fax machines to the map
* Dont delete new stuff
* Update 1
* Update 2
* Various fixes for faxes and paper
* AltClick
* Alt click
* Update code/game/objects/items/barriertape.dm
Co-authored-by: Byemoh <baiomurang@gmail.com>
* Its been a while
* oopsie Compile good.
* oopsie
* Spacing an QM
* Adds to lockers and belts
* Semantics - Anvil
* I FORGOT BORGS
* Few spans
* Update code/modules/paperwork/faxmachine.dm
Co-authored-by: adamsong <adamsong@users.noreply.github.com>
* Update code/modules/admin/topic.dm
Co-authored-by: adamsong <adamsong@users.noreply.github.com>
* Update code/modules/admin/topic.dm
Co-authored-by: adamsong <adamsong@users.noreply.github.com>
* Compile
Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
Co-authored-by: adamsong <adamsong@users.noreply.github.com>
Co-authored-by: Byemoh <baiomurang@gmail.com>
* Ports the bodybag changes
Many changes
* Fixes the thing
Fixes the random change and gives the mining medic locker an environmental protection bag
* Fixed syndicate bags leaking gasses
This seems like a sloppy fix, but it works I guess
* wooooooooo bom do du do doo tchchchcshchsh dun dun duun
* put them in the closets
* neck layer above back
* uploads new versions, fixes qm cloak not appearing as an object
* forgot neck.dmi also contained all the cloaks
* Update neck.dmi
Co-authored-by: Idinuum <37936685+Idinuum@users.noreply.github.com>
* makes the medical webbing a reskinned medical belt since as is it's terrible
* Update mining_medic.dm
* Update plasmaman.dm
* removes the medical belt from the mining medic's locker since they won't need it
* Adding medical and engineering awards and award boxes.
* Adding the boxes to the lockers.
* typos WOO
* more space for medals to fit them all in cap's box
* Fixed typo: portaying -> portraying
* Removed engineering mention from science award (replaced with robotics)
* piss
* second set of files
* theos feels pain and dies
* code works lmao
* other stuff
* YES YES YES
* Update zombies.dm
* egg
* whoops
* bubblegum alt attacks won't wound
* bone hurting juice hurts bones
* something's fucky wucky
* humans are no longer blue space babes but projectile damage is still wack
* IT WORKS???????
* other stuff
* turns out im big brain and already handled that should be testable live now
* WHOOPS
* medical pens not in stupid area
* fix regen mesh icons
* tool_behavior and defines plus allowing wound healing to override surgical tool no touchy bit
* should help
* mapping problem
* fix monkies shitting out blood all the time
* going to remove examine_more being stupid
* this is stupid i think it works though
* Empty commit, more bad code
* this probably fdixes something
* buckshot buffed back to where it should be
* woundings
* missed this one
* fix gamebreaking bug
* turns out damaging ANYTHING causes suit sensors to break whoops
* stuff up to limb disable refactor
* aid scanner can no longer kill you if you use it too much, preventing the robot uprising for another few decades
* Update burn_dressing.dm
* wtf
* shotgun slugs have a wound bonus of -30 putting them in line with other high damage weaponry that has even less
* burn debriding uses the scalpel rather than the hemostat
* debriding for patch/treat no longer causes wounds
* Give syndicate medical cyborg a bonesetter
* like 5 more prs ported
* fixes burn ointment and mesh application not having a progress bar
* gamemode zombies get easydismember and easily wounded
* managed to screw up self cautery this fixes it
* carbons can't use check self for injuries but humans can
* honey gives +2 sanitization to burns
* re-add this if sensors get fixed
* should fix a runtime I made on accident when trying to make examine more less jank
* last 2 prs and some holdup fixes since these touched on that
* set target = src so the progress par shows up i think
* Update mutations.dm
* fixes twohanded reuqired weapons by reverting some change I don't understand
* fixes blood sprites
* actually properly fixes the thing
Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
