* Gooborgs!
add: Adds gooborgs! Sprites from Toriate
code: Robotic eswords and batons now count as robotic weapons and trigger appropriate sprites.
* shocker
* cargofix
* some more
* sendit
* rest sprites
* mmoree
* Glowy tummies
Will make all the catborg sprites scream, but let's see what the UT says
* FIXES MORE SPRITES AAAAAAAAAAAAAAAA
* License
* fixed sprites
* better handling
* rewrite
* bonus damage
* Fixes stunbaton
* status check
* Makes BCS remove the charge properly
* charge
* subsystem
* some more new to init
* rigs
* rigs
* intellisense moment
* telcoms and landmarks
* fix that as well
* some more minor things
* re add missing message
* fix trash eating...
* some borg upgrade overhaul
* .
* adjust icon some
* .
* fixes the borg hud store icon breaking
* refactor borg skill power usage, add bluespace pounce
* .
* .
* copy paste mistakes...
* first check distance then drain power on leap
* small oversight in the calculation
* comment
* second silicon hud store icon case
* Update settings
* Whitespace changes
* Comment out merger hooks in gitattributes
Corrupt maps would have to be resolved in repo before hooks could be updated
* Revert "Whitespace changes"
This reverts commit afbdd1d844.
* Whitespace again minus example
* Gitignore example changelog
* Restore changelog merge setting
* Keep older dmi hook attribute until hooks can be updated
* update vscode settings too
* Renormalize remaining
* Revert "Gitignore example changelog"
This reverts commit de22ad375d.
* Attempt to normalize example.yml (and another file I guess)
* Try again
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.
Conflicts:
code/game/objects/items/weapons/clown_items.dm
code/game/objects/items/weapons/material/kitchen.dm
code/game/objects/items/weapons/stunbaton.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
code/modules/mob/living/simple_animal/simple_animal.dm
Cleaned up the files themselves.
Everything in code/game/objects should now be in proper files or places with the exception of the files in the /weapons/ sub-folder.
There's two instances of me not following the exact file structure.
- /obj/item/brain has been moved to a file in mob/living/carbon/brain
- /obj/item/clothing/mask/facehugger has been moved into mob/living/carbon/alien/special
Both of these may not make sense according to the object structure, but they do make sense logically. If it's a problem just move them.
Next up: Finish the files in the weapon folder, then start moving defines down.
My god I hope I havent broken everything.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4547 316c924e-a436-60f5-8080-3fe189b3f50e
Cameron Lennox
