* ko
* why
* huh
* fu
* e
* ok new item then
* More lights!
* whoops
* b
* why
* w
* lmc
* im bad at english
* yanke
* okay i tried my best
* improve
* yanke
* improve take 2
* take 3
* hyposprays but good
* upgrade applies to hypo not the modkit itself
* del the modkit
* del modkit 2
* add hypo panel
* typepath typo
* add sound to installing upgrade
* moves stuff out of the way of hypo vend in yog/meta
* readds hypo to box
* poke turdis
* Switching to another computer
* half way there
* Should compile now but will be missing icons
* )
* ident
* Add 1/3 DMIs
* Fix taste
* Apply changes
* Sprites n stuff and revive delay
* add organ sprites
* More IPC Screens and Antennas
* L + Ring + Fix
* 2 New Eye Screens
* Fixes
* Fixes
* :) + :( + Reorginization
* Hand Sprites (Needs Spriters Work)
* Make the hands look much less retarted
* Ports Morpheus Cyberkinetics Chassis from Shiptest
https://github.com/shiptest-ss13/Shiptest/pull/1181
* remove debug print
* A bunch of fixes
* get out of there code
* Its not an upgrader cyberheart
* Replaces some color screens with Greyscale variants
* Update code/modules/mob/living/carbon/human/species_types/IPC.dm
Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
* Jesus christ burn hits hard
* makes the head decapitable for IPCs
* Retard managed to commit a map
* NO_DEFIB trait and makes emotes work
* revive code
* Update IPC.dm
* Update objective.dm
* IPC Revival Board + Hair Fix
* Gives attach limb a return for limb reattachment
* well fuck you too then
* IPC Organs no longer decay
* Hopefully makes IPC revival work less buggily
* Custom hud icon
* Makes IPCs genderless
* fixes
* Fix starving popup
* Crit fixes and adjustments
* Adjustments & Cleanups
* Update defib.dm
* merge icons
* Update negative.dm
* should fix the rest of quirks + noblood
* FUCK
* Fixes organ duplication
* Removes hemophiliac for noblood people
* no defibbing ipcs fuck you
* moment moment
Co-authored-by: Anvilman6 <54463777+Anvilman6@users.noreply.github.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
* 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
* the great sec buff
* bulky when loaded
* adds kevlar sprites, adjusts helm sprite
* mk1 is bluespace infused
* renames stuff
* warning msgs
* plates now deal damage
* fix merge conflict
* puts hats to master
* adds plate to hats
* checks out hats.dmi from master
* puts plate helmet in hats.dmi
* checks out hats.dmi from master again
* adds plate-helmet to hats.dmi by creating a new icon state
* Update hats.dmi
* vomit time
* Update revolver.dm
* Update revolver.dm
* Update revolver.dm
* revolver now on belt yay
* long live new caliber
* im a fucming dumbass
* I'm more of a dumbass somehow lmao
* adds new sprites for the gutterpunch rounds
* adds a missing period
* changes up descriptions
* last description change
* seven != six
* almost final description update
* now final description update
* orca told me not to update the sprites yet i fail to see how there is going to be new sprites if it's merged just like that so i'm never trusting them again
* removes gutterpunch from pr
* I hate map shit
* should fix
* should also fix?
* maybe?
* fix??
Co-authored-by: nmajask <nmajask@gmail.com>
* Added floor and decal painter
* Yes fixed
* Fixes again
* Makes decal painter can be build in engi protolathe
* Added more cool tiles
* removed floor sprayer sprite
* Batons V2
* Fuck off bibby
* e
* OR now
* fixes status
* e
* e
* Fixes batons not hitting people with implant check
* Apply suggestions from code review
Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
* 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>
* Squashed commit of the following:
commit 8ec2fca541
Author: nmajask <nmajask@gmail.com>
Date: Thu May 19 15:26:09 2022 -0400
Converts embedding into a proc
also adds a embed tic proc that is called whenever the embedde has a life tick
* Syringe gun rework
Syringe gun now embeds syringes and slowly transfers the reagents
* Squashed commit of the following:
commit c6d04d476b
Author: nmajask <nmajask@gmail.com>
Date: Sat May 21 16:12:51 2022 -0400
b
commit da83fdc5a0
Author: nmajask <nmajask@gmail.com>
Date: Sat May 21 15:47:52 2022 -0400
a
commit 8ec2fca541
Author: nmajask <nmajask@gmail.com>
Date: Thu May 19 15:26:09 2022 -0400
Converts embedding into a proc
also adds a embed tic proc that is called whenever the embedde has a life tick
* a
* Pain
* Fixes and Buff
* buff
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
