* adds sound
* felinids can hiss
* felinids can purr
* You can no longer purr at people
NanoTrasen has noticed an increase in harassment complaints from stations that employ felinids. The reports indicate that felinids would purr at people. NanoTrasen has since banned workplace purring at people.
* removes purring
* update lizard hiss
* Morphine administered.
* no wonder it compiled with no errors lmao
* wow it actually works
* removes useless stat that seems to do nothing
* done
* forgot to save this
* fixes the damage handler not working
* requested changes, tweaks some voiceline chances
* suit doesn't restrict speech when emagged
* changes the suit sprites to be better
* the suit now properly hides gloves, shoes, and jumpsuits
* Apply suggestions from code review
Co-authored-by: Ling <lingbleed@gmail.com>
* requested changes
* requested changed
* oops
Co-authored-by: Ling <lingbleed@gmail.com>
* Tweaks to IPC martial arts
* bullet stuff
* Other tweaks
* remove one gibs from execute, two is enough
undefine forgotten ability
* new dash sound
* servostep louder
* rename and thing
* test
* done
* lastly
* shocking
* bit
* span span
* change
* delete other things
* no it was green
* forgot one decal
* sprites slightly adjusted
* bugfix
* reverse
* ⠀⠀⠀⠀⠀⠀⠀⣠⣴⣶⣿⣿⣷⣶⣄⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⣾⣿⣿⡿⢿⣿⣿⣿⣿⣿⣿⣿⣷⣦⡀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⢀⣾⣿⣿⡟⠁⣰⣿⣿⣿⡿⠿⠻⠿⣿⣿⣿⣿⣧⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⣾⣿⣿⠏⠀⣴⣿⣿⣿⠉⠀⠀⠀⠀⠀⠈⢻⣿⣿⣇⠀⠀⠀
⠀⠀⠀⠀⢀⣠⣼⣿⣿⡏⠀⢠⣿⣿⣿⠇⠀⠀⠀⠀⠀⠀⠀⠈⣿⣿⣿⡀⠀⠀
⠀⠀⠀⣰⣿⣿⣿⣿⣿⡇⠀⢸⣿⣿⣿⡀⠀⠀⠀⠀⠀⠀⠀⠀⣿⣿⣿⡇⠀⠀
⠀⠀⢰⣿⣿⡿⣿⣿⣿⡇⠀⠘⣿⣿⣿⣧⠀⠀⠀⠀⠀⠀⢀⣸⣿⣿⣿⠁⠀⠀
⠀⠀⣿⣿⣿⠁⣿⣿⣿⡇⠀⠀⠻⣿⣿⣿⣷⣶⣶⣶⣶⣶⣿⣿⣿⣿⠃⠀⠀⠀
⠀⢰⣿⣿⡇⠀⣿⣿⣿⠀⠀⠀⠀⠈⠻⣿⣿⣿⣿⣿⣿⣿⣿⣿⠟⠁⠀⠀⠀⠀
⠀⢸⣿⣿⡇⠀⣿⣿⣿⠀⠀⠀⠀⠀⠀⠀⠉⠛⠛⠛⠉⢉⣿⣿⠀⠀⠀⠀⠀⠀
⠀⢸⣿⣿⣇⠀⣿⣿⣿⠀⠀⠀⠀⠀⢀⣤⣤⣤⡀⠀⠀⢸⣿⣿⣿⣷⣦⠀⠀⠀
⠀⠀⢻⣿⣿⣶⣿⣿⣿⠀⠀⠀⠀⠀⠈⠻⣿⣿⣿⣦⡀⠀⠉⠉⠻⣿⣿⡇⠀⠀
⠀⠀⠀⠛⠿⣿⣿⣿⣿⣷⣤⡀⠀⠀⠀⠀⠈⠹⣿⣿⣇⣀⠀⣠⣾⣿⣿⡇⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠹⣿⣿⣿⣿⣦⣤⣤⣤⣤⣾⣿⣿⣿⣿⣿⣿⣿⣿⡟⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠻⢿⣿⣿⣿⣿⣿⣿⠿⠋⠉⠛⠋⠉⠉⠁⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠉⠉⠁
* cool add
* kol
* done
* you cant see them
* final
* unga bunga
* FUCK
* f
* finish
* use smart fridge ui
* fix
* forgot
* thanks biomu
* final fix
* mostly just on select and unselect stuff
also makes the new file
* Progress
* rename
* IT ALMOST COMPILES
FIRST TRY BABY
* cleanup
bed time
* use the name
* Now with slashing sprite!
* fix
* pretty much done
* missing override
* plus axe and ifst
* dont doublekill people
* an
* reduce combat mech damage
* SOUND
* comment credit or whatever
* axe buff
* tehc web
* parentheses
* im going insane
* the pain never ends
* sprite n sound fix
* oh my god its done probably
* MARAUDER AND SMALL FIXES
* moar better sprites
* small fixes + mech suit change
* Various bugfixes and tweaks
* More feedback + wall break fix
* bump fix for centcomm
* play sound oops
* Sound amp + axe buff + wording
* more damage
* Pacifism fix + comments
* Thinly veiled reference implant
* Actually adds the icons and requested changes
* autosurgeon no longer one use
* tweaks to the emp effect
* Lets martyrs buy it too
* makes attack speed noticeable
* adds trigger sound effect
* adds a cooldown to the sound effect
* Gee I sure hope this PR never stacks an obnoxious number of cornflakes that force me to make a new PR
* forgot to adjust metalshock description
* i forgot to change magtype of the boarder!!
* USE your sprites damnit
* redundancy my beloved
* mild number tweaks
* first patch
* second patch
* small sprite changes
* third patch
* bullet speed patch
* gives ap to wt incend since it doesnt inherit it unlike the rubber
* makes trac less bad
* minor description oversights
* Update chair.dm
* Update sheet_types.dm
* Add files via upload
* Add files via upload
* removes accidental asymmetry, looks even better now
* un-deletes some other stuff
* adds motivation to the game
* makes sitting in the chair for longer than a minute motivate you
* adds a very motivating song
* adds Bury the Light to licensed songs
* i need to find how licensing works
* whoops forgot to change one test value
* stasis nerf
* aaa
* a
* a
* pain
* a
* wrapping up
* forgot to revert this
* pretty filter
* ctrl c ctrl v fails me again
* *scream
* spriting
* fex
* dont need this
* Surgical mat nerf
* pain
* 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>
* Fishing
* test
* put fish in your damn hands
* fish types and bait types and
* fixing things
* Update rods.dm
* more stuff
* ok
* yes
* all this stuff
* Update _basemap.dm
* Update game_options.txt
* Apply suggestions from code review
Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
* component
* move fishing
* Update yogstation.dme
* new icons
* yeah does what tatax yeah
* um new fishing cloths
* working more
* Update fishingbonus.dm
* yeah
* yup
* um ok
* Update fish.dm
* Update fishing.dm
* yep
Co-authored-by: tattax <71668564+tattax@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>
* Wow this branch is old
Adds the sound files so I can update this thing.
* Why GitHub desktop
*scream
* Adds the functionality
Adds interaction sounds to mod pcs
* tablet noises
"Adds PDA clicking sounds" by comma on Baystation
* Fixes the checks
Forgot I changed that
* Fixed the abrupt cutoff
I just made it fade out
* Update code/modules/modular_computers/file_system/programs/borg_monitor.dm
* Integrated PC stuff
Should fix it
* Oops
Ack
* Coding
Cant code to save my life
* Telescreen beeping
Some refinements and telescreen beeping
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
* let the man grill
* remove multiplier since you get bonus stuff from upgrades anyway
* the maps
* changes things made with protein nutriment to be have protein
* rest of the maps
* Adding unique sound for delta alert.
* Fixing double alert sounds, as well as tweaking Delta alert per Xoxeyos' advice
Co-authored-by: Aquizit <larthetc.gmail.com>
* 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>
* Admins have the right to give people heart attacks.
* Presumably fixes the category being outdated as fuck.
* Changes "R_ADMIN" to "R_FUN".
* Update code/modules/admin/admin.dm
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
* add basic stuff and minor tweaks
* stack healing change
* Update medical.dm
* makes things work better
* removes unneefded modularization
* Update medical.dm
* i am going to poo my pants
* thought i fixed that
* Update medicine.dm
* im stuff
* Update medicine.dm
* pant poop
* forgot that
* Apply suggestions from code review
not my fualt mostly
Co-authored-by: Hopekz <hopekxx@gmail.com>
* Update code/game/objects/items/stacks/medical.dm
Co-authored-by: Hopekz <hopekxx@gmail.com>
* Update misc.dm
Co-authored-by: Hopekz <hopekxx@gmail.com>