Commit Graph

5039 Commits

Author SHA1 Message Date
TheDZD 6515b10ccc Merge pull request #963 from ZomgPonies/superhero2
Superhero Overhaul Part 2: Magnetic Boogaloo
2015-05-08 16:55:59 -04:00
DZD ac14f6ebc8 Removes NO_PAIN species being stun immune 2015-05-08 15:19:35 -04:00
Tigercat2000 eee9339ef3 CBGI updat
This commit updates the previous commit with the latest changes from the
CB:GI git.

Primary Changes:
 - Dancing! Passively grab someone, they passively grab you, looks like
   dancing/wrestling. You get the image, I'm sure.
 - Clarifications and possible runtime nipping.
2015-05-08 07:56:16 -07:00
ZomgPonies 01a8fabaac Removed full access for supers 2015-05-07 23:51:15 -04:00
ZomgPonies a7a927b424 Finish up the E-N desc and default spell 2015-05-07 20:56:09 -04:00
ZomgPonies b6ee03a3be Minor shoe fix 2015-05-07 17:01:38 -04:00
ZomgPonies 7423d56c06 Adds E-N and gear 2015-05-07 16:12:43 -04:00
ZomgPonies 71a23c338a Gave griffin a freedom implant 2015-05-07 15:51:25 -04:00
ZomgPonies d249a7994e Made greyshirts look like greyshirt 2015-05-07 15:49:33 -04:00
ZomgPonies 0980c744db Fix henchman IDs and gave basic radios to eveyrone 2015-05-07 15:42:52 -04:00
Tigercat2000 fe5d0d907a Fix a few things with grabs
Previous commit broke a few things, this one fixes it

Fixed;
 - Runtime error of trying to assign something that was deleted
 - Nonsensical functionality
2015-05-07 06:25:05 -07:00
Tigercat2000 5f26969364 Merge remote-tracking branch 'upstream/master' into ContextBasedGrab
Conflicts:
	code/modules/mob/mob_grab.dm
2015-05-07 06:02:19 -07:00
Tigercat2000 4914e8c2b7 Adds a bunch of new things to grabs
This commit adds the following to the grab system:
 - Knifing (Attack with edge weapon while neckgrabbing)
 - Pressing eyes (Harm intent, neck grab, eye zone)
 - Jointlocking (Grab intent, neck grab, almost any limb)
 - Headbutting (Harm intent, neck grab, target chest or groin)
 - Pin (Disarm intent, pins affecting to the ground until you move or let
   go with help intent)
2015-05-07 05:56:14 -07:00
ZomgPonies dd4aba0c9e Panel oversight 2015-05-07 03:12:11 -04:00
Fox-McCloud 3c0beb216a Merge pull request #962 from ZomgPonies/superhero2
Superhero Overhaul Bugfix #1
2015-05-07 02:18:08 -04:00
ZomgPonies fc3fbcb298 Merge pull request #960 from Aurorablade/Ihavenoideawhatiamdoing
Updated Corgi pAI Sprite (take 2)
2015-05-07 02:04:02 -04:00
ZomgPonies a57560975d Merge pull request #957 from Krausus/CyborgHotkeys
Cyborg Pointing and Deselect/Unequip Module Hotkeys
2015-05-07 02:03:43 -04:00
ZomgPonies 841316bb83 Added descriptions for all current heroes. 2015-05-07 02:02:41 -04:00
ZomgPonies 956aa6eda1 Added action button for Griffon ability 2015-05-07 00:21:08 -04:00
ZomgPonies 98938edf61 minor commit to open PR 2015-05-06 23:53:38 -04:00
Fox-McCloud 828e3c9927 Merge pull request #952 from ZomgPonies/superhero
Massive Superhero Update
2015-05-06 23:40:08 -04:00
ZomgPonies 31fc0d39a5 Final touches on superheroes 2015-05-06 23:26:33 -04:00
Aurorablade 56ea5311a9 Revert "Manual update"
This reverts commit 7aa67928b3.
2015-05-06 20:57:37 -04:00
Aurorablade 55c2ad3941 Merge pull request #1 from Aurorablade/master
Manual update
2015-05-06 19:41:10 -04:00
ZomgPonies cd17fa4fb4 Refactor and clean up code 2015-05-06 19:14:22 -04:00
DZD 7f925dc8fa Fixes posibrains
Reverts changes made to brain_item.dm and posibrain.dm in the original
shadowling PR. They were made to stop runtimes but apparently broke
posibrains, the runtimes were completely senseless in the first place,
and only occur on that specific branch, tested these changes and no
runtimes occur.
2015-05-06 19:12:00 -04:00
Aurorablade 7aa67928b3 Manual update 2015-05-06 18:19:20 -04:00
Fox-McCloud e004610827 Merge pull request #956 from TheDZD/shadowling
Shadowling Fixes
2015-05-06 18:18:28 -04:00
ZomgPonies 9c011f5b25 Re-added hitblips for superheros POW WHAMMY 2015-05-06 18:05:16 -04:00
ZomgPonies d9fb43b674 Remove griffin's op powers and revert lasereyes change 2015-05-06 17:42:48 -04:00
ZomgPonies 68c17a1e06 Added Griffin recruit ability 2015-05-06 17:41:11 -04:00
DZD 830b7bde99 More fixes
- Fixes shadowling HUD (for real this time).
- Adds antag role display in shadowling hivemind, this prints
(Shadowling) or (Shadowling Thrall) prior to each message, depending on
the role of the speaker (although theoretically multi-antags could have
something else there).
2015-05-06 17:39:36 -04:00
ZomgPonies a02bb8a1ae Fix up show antagonist to list heroes and villains 2015-05-06 03:07:46 -04:00
Krausus a6f2d385f2 Adds cyborg deselect/unequip module hotkeys
Drop Item will now deselect, and Toggle Throw will now unequip and cycle
to the next module; previously, these hotkeys did nothing for cyborgs.
Also, unequipping a module while the module list is open will now update
it like it should.
2015-05-06 00:40:34 -04:00
Fox-McCloud 5a427555fd Merge pull request #954 from ZomgPonies/limbs
Minor limb sprite fix
2015-05-05 23:26:32 -04:00
DZD a769b4fc39 Shadowling fixes
- Fixes shadowling thralls not showing up on Check Antagonists.
- Also adds vampire thralls to Check Antagonists
- Fixes shadowlings not turning off hardsuit helmet lights.
- Fixes transforming into a shadowling dropping organs.
- Adds job such as blueshield, NT rep, and pod pilot to the list of jobs
that cannot be shadowlings.
- Remove ascended shadowling commune, transfers the shadowling's
languages to the ascendant instead.
- Fixes intercept not being sent to the station on shadowling rounds.
2015-05-05 21:44:44 -04:00
ZomgPonies 43981fb34e Added lightning spell to wizards 2015-05-05 20:54:57 -04:00
ZomgPonies 3503c285fa Add toolbelt with smokebombs and bolas to owlman 2015-05-05 20:48:27 -04:00
ZomgPonies 2cb22ac647 Finished adding LightnIan and the spells datum stuff 2015-05-05 19:52:38 -04:00
Aurorablade 5f65824f81 Updated Corgi pAI Sprite 2015-05-05 18:53:17 -04:00
ZomgPonies ee7e560919 Superhero Update 2015-05-05 17:13:16 -04:00
ZomgPonies 2e0a6ba100 More limb sprite fixes 2015-05-05 15:54:19 -04:00
ZomgPonies d106462fa5 Merge pull request #796 from TheDZD/shadowling
Port of /tg/station's Shadowlings [WIP]
2015-05-04 20:38:20 -04:00
Fox-McCloud e651eb4fb3 Merge pull request #935 from tigercat2000/MmmCableart
Cyborg cable coil + color picking
2015-05-04 19:42:14 -04:00
ZomgPonies 8e9f37b425 Merge pull request #943 from Krausus/Fixes
Fixes (Cyborg stuff, artifacts, cans)
2015-05-04 13:22:57 -04:00
Krausus c727fcefe3 Fixes magnetic gripper not gripping new frames 2015-05-04 05:11:34 -04:00
Krausus 25a8d35ab0 Fixes magnetic gripper never afterattack-ing
This fixes magnetic grippers not being able to mount frames. Also, this
includes an exception for magnetic grippers in the wall code, to prevent
superfluous wall pushes.
2015-05-04 03:49:02 -04:00
Krausus d7734eae57 Fixes cyborg module cycling 2015-05-04 02:56:37 -04:00
ZomgPonies 570fefea94 Should fix limb sprite issues 2015-05-04 02:38:28 -04:00
Krausus bce521b98e Fixes cyborgs being able to speak all languages
They're only intended to understand all languages. Which ones they can
speak depend on the module chosen.
2015-05-04 02:31:40 -04:00