DZD
ac14f6ebc8
Removes NO_PAIN species being stun immune
2015-05-08 15:19:35 -04:00
ZomgPonies
6b6ff9b10f
Merge pull request #972 from SirBloodBuske/master
...
Intercom Frame Icon fix
2015-05-08 15:04:40 -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
SirBloodBuske
a764cfdada
Intercom Frame Icon fix
2015-05-08 05:49:22 -07:00
Krausus
d8e6893e35
Improves dumping of "quick" containers
...
Allows all "quick" containers to be dumped into a disposal (click) or
onto a table (drag-drop).
2015-05-08 07:20:44 -04:00
ZomgPonies
01a8fabaac
Removed full access for supers
2015-05-07 23:51:15 -04:00
ZomgPonies
e7c1cf8eb3
Merge pull request #970 from Fox-McCloud/fixins
...
Various Fixes and Tweaks
2015-05-07 23:44:34 -04:00
Fox-McCloud
b20104b360
Various Fixes and Tweaks
2015-05-07 23:31:39 -04:00
ZomgPonies
a7a927b424
Finish up the E-N desc and default spell
2015-05-07 20:56:09 -04:00
ZomgPonies
bfb997f3d2
Gave EN a prototype magnetic spell
2015-05-07 20:51:47 -04:00
ZomgPonies
547f606677
Gave EN's suit minor magnitis, also made affect machine people
2015-05-07 18:20:55 -04:00
ZomgPonies
d3a8caddbf
Makes Owlman's belt reload every 60 seconds
2015-05-07 18:04:12 -04:00
Fox-McCloud
a8ead35ea5
Fixes Blob Zombies
2015-05-07 17:35:43 -04:00
DZD
55d3937c8c
Fluff item convenience
...
Along with a database change that I've made, this should allow fluff
items to be renamed on spawn without having to define them as a new
item.
2015-05-07 17:18:12 -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
0a7d2b8697
Added griffin headgear caw ability
2015-05-07 16:00:29 -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
ZomgPonies
d2dc8030e8
Add hooting ability to owlman's mask
2015-05-07 15:33:54 -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
f6c55407c2
Removed invocation from LightnIan power
2015-05-07 00:41:03 -04:00
ZomgPonies
45d04e7fd8
Merge pull request #961 from Krausus/LimbsLikePinatas
...
Fixes exploded limbs not launching their contents
2015-05-07 00:28:14 -04:00
ZomgPonies
82730e9b4a
Fix broken admin commands
2015-05-07 00:26:26 -04:00
ZomgPonies
956aa6eda1
Added action button for Griffon ability
2015-05-07 00:21:08 -04:00
ZomgPonies
a75f608398
Should only spawn one of each hero
2015-05-07 00:09:04 -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
Krausus
b1ec1563fc
Fixes exploded limbs not launching their contents
2015-05-06 22:56:52 -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
TheDZD
b18294a570
Merge pull request #951 from Fox-McCloud/bag-stack
...
Enables Bag Item Stacking
2015-05-06 17:25:39 -04:00
Krausus
644edad770
Swaps cyborg pointing and module cycling
...
Cyborgs now point the same way real people do, and cycle modules with
ctrl+middle click
2015-05-06 11:55:19 -04:00
